svnno****@sourc*****
svnno****@sourc*****
2008年 3月 3日 (月) 20:04:23 JST
SRADRevision: 524
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=524
Author: tach
Date: 2008-03-03 20:04:23 +0900 (Mon, 03 Mar 2008)
Log Message:
-----------
* Fix email message for new user creation
- You should create "mail_msg_newuser" data to template
"data;login;default"
Modified Paths:
--------------
slashjp/branches/2.5.0.192/debian/changelog
slashjp/branches/2.5.0.192/plugins/Login/login.pl
-------------- next part --------------
Modified: slashjp/branches/2.5.0.192/debian/changelog
===================================================================
--- slashjp/branches/2.5.0.192/debian/changelog 2008-02-26 11:58:41 UTC (rev 523)
+++ slashjp/branches/2.5.0.192/debian/changelog 2008-03-03 11:04:23 UTC (rev 524)
@@ -1,3 +1,11 @@
+slash (2.5.0.192-6) unstable; urgency=low
+
+ * Fix email message for new user creation
+ - You should create "mail_msg_newuser" data to template
+ "data;login;default"
+
+ -- Taku YASUI <tach****@osdn*****> Mon, 3 Mar 2008 10:06:08 +0000
+
slash (2.5.0.192-5) unstable; urgency=low
* Fix admin topic select window to change tree/alpabetical
Modified: slashjp/branches/2.5.0.192/plugins/Login/login.pl
===================================================================
--- slashjp/branches/2.5.0.192/plugins/Login/login.pl 2008-02-26 11:58:41 UTC (rev 523)
+++ slashjp/branches/2.5.0.192/plugins/Login/login.pl 2008-03-03 11:04:23 UTC (rev 524)
@@ -278,6 +278,7 @@
my $newpasswd = $slashdb->getNewPasswd($uid);
my $tempnick = $user_send->{nickname};
my $subject = getData('mail_subject', { nickname => $user_send->{nickname} });
+ my $mail_template = $form->{op} eq "newuser" ? "mail_msg_newuser" : "mail_msg";
# Pull out some data passed in with the request. Only the IP
# number is actually trustworthy, the others could be forged.
@@ -295,7 +296,7 @@
$ua =~ s/\s+/ /g;
$ua = substr(strip_attribute($ua), 0, 60);
- my $msg = getData('mail_msg', {
+ my $msg = getData($mail_template, {
newpasswd => $newpasswd,
tempnick => $tempnick,
remote_ip => $remote_ip,