kimptoc 01/12/28 04:14:07
Modified: src/java/org/apache/jetspeed/modules/actions JLoginUser.java
src/java/org/apache/jetspeed/modules/localization
JetspeedLocalization_en.properties
webapp/WEB-INF/conf JetspeedResources.properties
webapp/WEB-INF/templates/vm/emails password-reminder.vm
webapp/WEB-INF/templates/vm/navigations/html top.vm
xdocs changes.xml
Log:
bug 4142 - updated based on feedback
Revision Changes Path
1.20 +2 -10
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java
Index: JLoginUser.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLoginUser.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- JLoginUser.java 2001/12/27 15:11:10 1.19
+++ JLoginUser.java 2001/12/28 12:14:07 1.20
@@ -135,7 +135,7 @@
//build body via template
StringWriter email_body = new StringWriter();
- Context context = TurbineVelocity.getContext();
+ Context context = TurbineVelocity.getContext(data);
context.put( "data", data );
context.put( "user", user );
context.put("userurl",url);
@@ -150,15 +150,7 @@
loc = new Locale(lang,ctry);
}
- String templatePath = TemplateLocator.locateEmailTemplate(data,
JetspeedResources.getString("password.reminder.format"), loc);
-
- //Criteria crit = new Criteria();
- //String sender =
JetspeedResources.getString("newuser.confirm.email.from");
- //crit.add ( Email.SENDER_EMAIL, sender );
- //String senderName =
JetspeedResources.getString("newuser.confirm.email.name");
- //crit.add ( Email.SENDER_NAME, senderName );
- //crit.add ( Email.RECEIVER_EMAIL, user.getEmail() );
- //crit.add ( Email.RECEIVER_NAME, user.getFirstName() + " " +
user.getLastName() );
+ String templatePath = TemplateLocator.locateEmailTemplate(data,
JetspeedResources.getString("password.reminder.template"), loc);
SimpleEmail se = new SimpleEmail();
1.8 +6 -0
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_en.properties
Index: JetspeedLocalization_en.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/localization/JetspeedLocalization_en.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JetspeedLocalization_en.properties 2001/12/27 15:11:10 1.7
+++ JetspeedLocalization_en.properties 2001/12/28 12:14:07 1.8
@@ -9,6 +9,12 @@
JLOGINUSER_PASSWORDREMINDER_SENT=Your password has been emailed to you.
JLOGINUSER_PASSWORDREMINDER_ERROR=Error sending password reminder:
+PASSWORDREMINDER_GREETING=Hello
+PASSWORDREMINDER_BODY1=Your jetspeed account password is:
+PASSWORDREMINDER_BODY2=You can now go to the jetspeed site and login.
+PASSWORDREMINDER_END=Regards,
+PASSWORDREMINDER_PS=PS\n\nDon't forget that your username is:
+
CREATENEWUSERANDCONFIRM_PWNOTMATCH=Sorry, the passwords do not match.
CREATENEWUSERANDCONFIRM_NOUSERNAME=Sorry, you must supply a username.
CREATENEWUSERANDCONFIRM_NOEMAIL=Sorry, you must supply a valid email address.
1.54 +3 -3
jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedResources.properties
Index: JetspeedResources.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedResources.properties,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- JetspeedResources.properties 2001/12/28 11:04:49 1.53
+++ JetspeedResources.properties 2001/12/28 12:14:07 1.54
@@ -1,7 +1,7 @@
################################################################################
# Jetspeed Configuration
# Author: Kevin A. Burton ([EMAIL PROTECTED])
-# $Id: JetspeedResources.properties,v 1.53 2001/12/28 11:04:49 kimptoc Exp $
+# $Id: JetspeedResources.properties,v 1.54 2001/12/28 12:14:07 kimptoc Exp $
################################################################################
# This is the main file you will need to configuration Jetspeed. If there are
# any secondary files they will be pointed to from this file.
@@ -425,8 +425,8 @@
newuser.approval.reject.template=new-user-reject.vm
# Password reminder options
-password.reminder.option.enable=false
-password.reminder.format=password-reminder.vm
+password.reminder.enable=false
+password.reminder.template=password-reminder.vm
#########################################
1.2 +5 -7
jakarta-jetspeed/webapp/WEB-INF/templates/vm/emails/password-reminder.vm
Index: password-reminder.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/emails/password-reminder.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- password-reminder.vm 2001/12/28 11:05:29 1.1
+++ password-reminder.vm 2001/12/28 12:14:07 1.2
@@ -3,23 +3,21 @@
#set ($ignored =
$email.setFrom($config.getString("newuser.confirm.email.from"),$config.getString("newuser.confirm.email.name")
))
#set ($ignored = $email.setSubject("Jetspeed Administration"))
##
-Hello $!user.FirstName $!user.LastName,
+$l10n.PASSWORDREMINDER_GREETING $!user.FirstName $!user.LastName,
-Your jetspeed account password is:
+$l10n.PASSWORDREMINDER_BODY1
$user.Password
-You can now go to the jetspeed site and login.
+$l10n.PASSWORDREMINDER_BODY2
$userurl
-Regards,
+$l10n.PASSWORDREMINDER_END
$config.getString("newuser.confirm.email.name")
-PS
-
-Don't forget that your username is: $user.UserName
+$l10n.PASSWORDREMINDER_PS $user.UserName
1.10 +3 -3
jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/html/top.vm
Index: top.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/navigations/html/top.vm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- top.vm 2001/12/27 15:11:11 1.9
+++ top.vm 2001/12/28 12:14:07 1.10
@@ -103,9 +103,9 @@
</td>
<td rowspan="2" align="center">
<input name="submit" type="submit" value="Login" tabindex="3"
style="font-size:10" />
-#if ( $config.getBoolean("password.reminder.option.enable") == true )
- <input name="eventSubmit_doReminder" type="submit" tabindex="4"
value="Password?" style="font-size:10" />
- <br/><small>Forgotten your password?<br/>
+#if ( $config.getBoolean("password.reminder.enable") == true )
+ <input name="eventSubmit_doReminder" type="submit" tabindex="4"
value="Password?" style="font-size:10" >
+ <br><small>Forgotten your password?<br>
Enter your username<br> and click Password?</small>
#end
1.3 +2 -1 jakarta-jetspeed/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- changes.xml 2001/12/22 03:22:47 1.2
+++ changes.xml 2001/12/28 12:14:07 1.3
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!--
-$Id: changes.xml,v 1.2 2001/12/22 03:22:47 paulsp Exp $
+$Id: changes.xml,v 1.3 2001/12/28 12:14:07 kimptoc Exp $
-->
<document>
<properties>
@@ -24,6 +24,7 @@
<li>
Add - Added Change Log (PS)
+ Add - Bug # 4142 - Password Reminder Facility (CK)
</li>
<li>
Update - Implemented Internationalization in the Customizer (PS)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
