raphael 01/05/29 02:59:27
Modified: src/java/org/apache/jetspeed/modules/actions
UpdateAccount.java
Log:
fix a confirmation mail issue
(patch from David S. Taylor)
Revision Changes Path
1.11 +5 -4
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/UpdateAccount.java
Index: UpdateAccount.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/UpdateAccount.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- UpdateAccount.java 2001/05/01 17:37:07 1.10
+++ UpdateAccount.java 2001/05/29 09:59:26 1.11
@@ -63,11 +63,11 @@
import org.apache.turbine.modules.Action;
import org.apache.turbine.modules.ActionLoader;
import org.apache.turbine.services.localization.Localization;
-import org.apache.turbine.services.resources.TurbineResources;
import org.apache.turbine.services.security.TurbineSecurity;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.GenerateUniqueId;
import org.apache.turbine.om.security.User;
+import org.apache.jetspeed.services.resources.JetspeedResources;
/**
*
@@ -82,7 +82,7 @@
// check to make sure the user has logged in before accessing this screen
if ( ! data.getUser().hasLoggedIn() )
{
- data.setScreenTemplate( TurbineResources.getString(
"services.JspService.screen.error.NotLoggedIn", "Error" ) );
+ data.setScreenTemplate( JetspeedResources.getString(
"services.JspService.screen.error.NotLoggedIn", "Error" ) );
return;
}
@@ -158,10 +158,11 @@
backToEditAccount( data, screenData );
return;
}
-
+
+ boolean enableMail = JetspeedResources.getBoolean("confirm.email.enable",
false);
String currentEmail = (String) data.getUser().getEmail();
- if ( currentEmail == null || ! currentEmail.equalsIgnoreCase(email) )
+ if ( enableMail && ( currentEmail == null || !
currentEmail.equalsIgnoreCase(email) ) )
{
//Send confirmation email if different than current
data.getUser().setEmail( email );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
