Author: jkoster
Date: 2009-06-05 13:14:06 +0200 (Fri, 05 Jun 2009)
New Revision: 35764
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/util/EmailSender.java
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform/ResponseFormPortlet.java
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-ecard/src/java/com/finalist/portlets/ecard/EcardPortlet.java
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-emailalert/src/java/com/finalist/portlets/emailalert/EmailAlertPortlet.java
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/AbstractLoginPortlet.java
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/RegisterPortlet.java
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/UnregisterPortlet.java
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-maileditors/src/java/com/finalist/portlets/reactform/ReactFormPortlet.java
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-mailfriend/src/java/com/finalist/portlets/mailfriend/MailFriendPortlet.java
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter/UnsubscribePortlet.java
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-preferences/src/java/com/finalist/portlets/preferences/ProfilePortlet.java
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-preferences/src/java/com/finalist/preferences/util/ProfileUtil.java
Log:
CMSC-1422 - Email methods should be centralized in CMSc: isEmailAddress and
getRegexp methods move to EmailSender Util class
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/util/EmailSender.java
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/util/EmailSender.java
2009-06-05 10:42:17 UTC (rev 35763)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/util/EmailSender.java
2009-06-05 11:14:06 UTC (rev 35764)
@@ -22,6 +22,8 @@
*/
public final class EmailSender {
+ public static final String DEFAULT_EMAILREGEX =
"^([a-zA-Z0-9_.-])+@(([a-zA-Z0-9-])+.)+([a-zA-Z0-9]{2,4})+$";
+
/**
* Constructor. Creates a new instance.
*/
@@ -36,7 +38,7 @@
* @param emailTo The email address of the receiver
* @param subject The subject of the email
* @param body The body of the email
- * @throws MessagingException message send faiked
+ * @throws MessagingException message send failed
* @throws UnsupportedEncodingException The Character Encoding is not
supported
*/
public static void sendEmail(String emailFrom, String nameFrom, String
emailTo, String subject, String body)
@@ -53,7 +55,7 @@
* @param subject The subject of the email
* @param body The body of the email
* @param replyTo Address as reply-to header in the message
- * @throws MessagingException message send faiked
+ * @throws MessagingException message send failed
* @throws UnsupportedEncodingException The Character Encoding is not
supported
*/
public static void sendEmail(String emailFrom, String nameFrom, String
emailTo, String subject,
@@ -69,9 +71,10 @@
* @param nameFrom The name of the sender
* @param toAddresses The list of email addresses of the receivers
* @param subject The subject of the email
- * @param body The body of the email @param fileName The name of the
attachment
+ * @param body The body of the email
+ * @param fileName The name of the attachment
* @param attachment Binary part to add to the email message
- * @throws MessagingException message send faiked
+ * @throws MessagingException message send failed
* @throws UnsupportedEncodingException The Character Encoding is not
supported
*/
public static void sendEmail(String emailFrom, String nameFrom,
List<String> toAddresses, String subject, String body,
@@ -86,10 +89,11 @@
* @param nameFrom The name of the sender
* @param toAddresses The list of email addresses of the receivers
* @param subject The subject of the email
- * @param body The body of the email @param fileName The name of the
attachment
+ * @param body The body of the email
+ * @param fileName The name of the attachment
* @param attachment Binary part to add to the message
* @param replyTo Address as reply-to header in the message
- * @throws MessagingException message send faiked
+ * @throws MessagingException message send failed
* @throws UnsupportedEncodingException The Character Encoding is not
supported
*/
public static void sendEmail(String emailFrom, String nameFrom,
List<String> toAddresses,
@@ -173,10 +177,51 @@
Transport.send(message);
}
- @SuppressWarnings("static-access")
private static Session getMailSession() {
Session session = ((SendMail) MMBase.getModule("sendmail")).getSession();
return session;
}
+
+ public static boolean isEmailAddress(String emailAddress) {
+ if (emailAddress == null) {
+ return false;
+ }
+ if (StringUtils.isBlank(emailAddress)) {
+ return false;
+ }
+ String emailRegex = getEmailRegex();
+ return emailAddress.trim().matches(emailRegex);
+ }
+
+
+ public static boolean isEmailAddress(List<String> emailList) {
+ if (emailList == null) {
+ return false;
+ }
+ if (emailList.isEmpty()) {
+ return false;
+ }
+
+ String emailRegex = getEmailRegex();
+ for (String email : emailList) {
+ if (email == null || StringUtils.isBlank(email)) {
+ return false;
+ }
+ if (!email.matches(emailRegex)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ public static String getEmailRegex() {
+ String emailRegex = PropertiesUtil.getProperty("email.regex");
+ if (StringUtils.isNotBlank(emailRegex)) {
+ return emailRegex;
+ }
+ return DEFAULT_EMAILREGEX;
+ }
+
}
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform/ResponseFormPortlet.java
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform/ResponseFormPortlet.java
2009-06-05 10:42:17 UTC (rev 35763)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform/ResponseFormPortlet.java
2009-06-05 11:14:06 UTC (rev 35764)
@@ -53,7 +53,6 @@
protected static final String RADIO_EMPTY = "[niets gekozen]";
protected static final String TEXTBOX_EMPTY = "[niet ingevuld]";
protected static final String REGEX = " ";
- protected static final String DEFAULT_EMAILREGEX =
"^([a-zA-Z0-9_.-])+@(([a-zA-Z0-9-])+.)+([a-zA-Z0-9]{2,4})+$";
@Override
@@ -111,7 +110,7 @@
}
if ((type == TYPE_TEXTBOX) && sendEmail) { //If data is used
as email address, then it should be valid
- if (!isEmailAddress(userEmailAddress)) {
+ if (!EmailSender.isEmailAddress(userEmailAddress)) {
errorMessages.put(fieldIdentifier,
"view.formfield.invalid");
}
}
@@ -256,8 +255,8 @@
if (StringUtils.isNotBlank(userEmailText.toString())
&& StringUtils.isNotBlank(userEmailSenderName)
- && isEmailAddress(userEmailAddress)
- && isEmailAddress(userEmailSenderAddress)) {
+ && EmailSender.isEmailAddress(userEmailAddress)
+ && EmailSender.isEmailAddress(userEmailSenderAddress)) {
try {
EmailSender.sendEmail(userEmailSenderAddress, userEmailSenderName,
userEmailAddress,
userEmailSubject, userEmailText.toString());
@@ -300,7 +299,7 @@
if (StringUtils.isNotBlank(userEmailAddress)) {
senderName = userEmailAddress + " [CMS]";
}
- if (!isEmailAddress(senderEmailAddress)) {
+ if (!EmailSender.isEmailAddress(senderEmailAddress)) {
return false; //Last check email address
}
@@ -319,7 +318,7 @@
List<String> emailList = splitEmailAddresses(emailAddressesValue);
- if (!isEmailAddress(emailList)) {
+ if (!EmailSender.isEmailAddress(emailList)) {
getLogger().error("error sending email. Some of the following
emailaddresses are incorrect: " + emailList.toString());
return false; //Could not sent email because of false email address
}
@@ -472,39 +471,6 @@
}
- public boolean isEmailAddress(String emailAddress) {
- if (emailAddress == null) {
- return false;
- }
- if (StringUtils.isBlank(emailAddress)) {
- return false;
- }
-
- String emailRegex = getEmailRegex();
- return emailAddress.trim().matches(emailRegex);
- }
-
- public boolean isEmailAddress(List<String> emailList) {
- if (emailList == null) {
- return false;
- }
- if (emailList.isEmpty()) {
- return false;
- }
-
- String emailRegex = getEmailRegex();
- for (String email : emailList) {
- if (email == null || StringUtils.isBlank(email)) {
- return false;
- }
- if (!email.matches(emailRegex)) {
- return false;
- }
- }
-
- return true;
- }
-
private long getMaxAttachmentSize() {
long maxFileSize = DEFAULT_MAXFILESIZE;
String maxFileSizeValue =
PropertiesUtil.getProperty("email.maxattachmentsize");
@@ -521,12 +487,4 @@
return maxFileSize * MEGABYTE;
}
- protected String getEmailRegex() {
- String emailRegex = PropertiesUtil.getProperty("email.regex");
- if (StringUtils.isNotBlank(emailRegex)) {
- return emailRegex;
- }
- return DEFAULT_EMAILREGEX;
- }
-
}
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-ecard/src/java/com/finalist/portlets/ecard/EcardPortlet.java
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-ecard/src/java/com/finalist/portlets/ecard/EcardPortlet.java
2009-06-05 10:42:17 UTC (rev 35763)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-ecard/src/java/com/finalist/portlets/ecard/EcardPortlet.java
2009-06-05 11:14:06 UTC (rev 35764)
@@ -23,6 +23,7 @@
import com.finalist.cmsc.portalImpl.PortalConstants;
import com.finalist.cmsc.portlets.ContentChannelPortlet;
import com.finalist.cmsc.services.sitemanagement.SiteManagement;
+import com.finalist.cmsc.util.EmailSender;
import com.finalist.cmsc.util.ServerUtil;
import com.finalist.pluto.portalImpl.core.PortalURL;
@@ -48,7 +49,6 @@
protected static final String TEXT_BODY = "textBody";
protected static final String SELGALLERY = "selgallery";
protected static final int TEXTAREA_MAXLENGTH = 1024;
- protected static final String DEFAULT_EMAILREGEX =
"^([a-zA-Z0-9_.-])+@(([a-zA-Z0-9-])+.)+([a-zA-Z0-9]{2,4})+$";
@Override
@@ -78,13 +78,13 @@
if (StringUtils.isBlank(fromEmail)) {
errorMessages.put(FROM_EMAIL, "view.ecard.fromEmail.empty");
}
- else if (!fromEmail.matches(getEmailRegex())) {
+ else if (!EmailSender.isEmailAddress(fromEmail)) {
errorMessages.put(FROM_EMAIL, VIEW_ECARD_INVALID);
}
if (StringUtils.isBlank(toEmail)) {
errorMessages.put(TO_EMAIL, "view.ecard.toEmail.empty");
}
- else if (!toEmail.matches(getEmailRegex())) {
+ else if (!EmailSender.isEmailAddress(toEmail)) {
errorMessages.put(TO_EMAIL, VIEW_ECARD_INVALID);
}
if (StringUtils.isBlank(fromName)) {
@@ -259,15 +259,4 @@
}
}
-
- private String getEmailRegex() {
- String emailRegex = PropertiesUtil.getProperty("email.regex");
- if (StringUtils.isNotBlank(emailRegex)) {
- return emailRegex;
- }
- else {
- return DEFAULT_EMAILREGEX;
- }
- }
-
}
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-emailalert/src/java/com/finalist/portlets/emailalert/EmailAlertPortlet.java
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-emailalert/src/java/com/finalist/portlets/emailalert/EmailAlertPortlet.java
2009-06-05 10:42:17 UTC (rev 35763)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-emailalert/src/java/com/finalist/portlets/emailalert/EmailAlertPortlet.java
2009-06-05 11:14:06 UTC (rev 35764)
@@ -15,6 +15,7 @@
import com.finalist.cmsc.mmbase.*;
import com.finalist.cmsc.portlets.ContentPortlet;
+import com.finalist.cmsc.util.EmailSender;
import com.finalist.cmsc.util.HttpUtil;
import com.finalist.pluto.portalImpl.core.CmscPortletMode;
@@ -43,11 +44,10 @@
if (contentElement != null) {
String emailAddress = request.getParameter(EMAILADDRESS);
String subscribePage = request.getParameter(SUBSCRIBEPAGE);
- String emailRegex = PropertiesUtil.getProperty("email.regex");
if (StringUtils.isBlank(emailAddress)) {
errorMessages.put(EMAILADDRESS, "view.emailaddress.empty");
}
- else if (!emailAddress.matches(emailRegex)) {
+ else if (!EmailSender.isEmailAddress(emailAddress)) {
errorMessages.put(EMAILADDRESS, "view.emailaddress.invalid");
}
if (StringUtils.isBlank(subscribePage)) {
@@ -56,7 +56,7 @@
if (errorMessages.size() == 0) {
Cloud cloud = getCloudForAnonymousUpdate();
Node emailAlert = cloud.getNode(contentElement);
- // check if the emailaddress already exists, otherwise create it
+ // check if the email address already exists, otherwise create
it
Node subscriberNode = SearchUtil.findNode(cloud, SUBSCRIBER,
EMAILADDRESS, emailAddress);
if (subscriberNode == null) {
NodeManager subscriberNodeManager =
cloud.getNodeManager(SUBSCRIBER);
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/AbstractLoginPortlet.java
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/AbstractLoginPortlet.java
2009-06-05 10:42:17 UTC (rev 35763)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/AbstractLoginPortlet.java
2009-06-05 11:14:06 UTC (rev 35764)
@@ -25,7 +25,6 @@
import org.mmbase.bridge.Relation;
import org.mmbase.bridge.util.SearchUtil;
-import com.finalist.cmsc.mmbase.PropertiesUtil;
import com.finalist.cmsc.mmbase.RelationUtil;
import com.finalist.cmsc.navigation.NavigationUtil;
import com.finalist.cmsc.portalImpl.PortalConstants;
@@ -45,7 +44,6 @@
protected static final String REGISTRATIONPAGE = "registrationpage";
protected static final String REGISTRATIONPAGEPATH = "registrationpagepath";
protected static final String PAGE = "page";
- public static final String DEFAULT_EMAILREGEX =
"^([a-zA-Z0-9_.-])+@(([a-zA-Z0-9-])+.)+([a-zA-Z0-9]{2,4})+$";
private static final Log log =
LogFactory.getLog(AbstractLoginPortlet.class);
@@ -196,23 +194,4 @@
return DEFAULT_EMAIL_CONFIRM_TEMPLATE;
}
- protected boolean isEmailAddress(String emailAddress) {
- if (emailAddress == null) {
- return false;
- }
- if (StringUtils.isBlank(emailAddress)) {
- return false;
- }
-
- String emailRegex = getEmailRegex();
- return emailAddress.trim().matches(emailRegex);
- }
-
- protected String getEmailRegex() {
- String emailRegex = PropertiesUtil.getProperty("email.regex");
- if (StringUtils.isNotBlank(emailRegex)) {
- return emailRegex;
- }
- return DEFAULT_EMAILREGEX;
- }
}
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java
2009-06-05 10:42:17 UTC (rev 35763)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java
2009-06-05 11:14:06 UTC (rev 35764)
@@ -147,7 +147,7 @@
String emailFrom = preferences.getValue(EMAIL_FROMEMAIL,
null);
String nameFrom = preferences.getValue(EMAIL_FROMNAME, null);
emailText = getEmailBody(emailText,request, authentication,
person);
- if (StringUtils.isNotBlank(emailFrom) &&
!isEmailAddress(emailFrom)) {
+ if (StringUtils.isNotBlank(emailFrom) &&
!EmailSender.isEmailAddress(emailFrom)) {
throw new AddressException("Email address '" + emailFrom +
"' is not available");
}
EmailSender.sendEmail(emailFrom, nameFrom, email,
emailSubject, emailText,
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/RegisterPortlet.java
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/RegisterPortlet.java
2009-06-05 10:42:17 UTC (rev 35763)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/RegisterPortlet.java
2009-06-05 11:14:06 UTC (rev 35764)
@@ -100,7 +100,7 @@
if (StringUtils.isBlank(emailTo)) {
errorMessages.put(ACEGI_SECURITY_FORM_EMAIL_KEY,
"register.email.empty");
- } else if (!isEmailAddress(emailTo)) {
+ } else if (!EmailSender.isEmailAddress(emailTo)) {
errorMessages.put(ACEGI_SECURITY_FORM_EMAIL_KEY,
"register.email.match");
}
@@ -140,7 +140,7 @@
emailText = getEmailBody(emailText, request, authentication,
person);
try {
- if (!isEmailAddress(emailFrom)) {
+ if (!EmailSender.isEmailAddress(emailFrom)) {
errorMessages.put(ACEGI_SECURITY_DEFAULT, "Email address
'" + emailFrom + "' set in the edit_defaults properties is not available or
working!");
} else {
EmailSender.sendEmail(emailFrom, nameFrom, emailTo,
emailSubject, emailText, emailTo, "text/plain;charset=utf-8");
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/UnregisterPortlet.java
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/UnregisterPortlet.java
2009-06-05 10:42:17 UTC (rev 35763)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/UnregisterPortlet.java
2009-06-05 11:14:06 UTC (rev 35764)
@@ -19,6 +19,7 @@
import com.finalist.cmsc.services.community.ApplicationContextFactory;
import com.finalist.cmsc.services.community.person.PersonService;
import com.finalist.cmsc.services.community.security.AuthenticationService;
+import com.finalist.cmsc.util.EmailSender;
public class UnregisterPortlet extends AbstractLoginPortlet {
private static final String CONFIRMATION_TEXT = "confirmationText";
@@ -53,7 +54,7 @@
Map<String, String> errorMessages = new HashMap<String, String>();
if (StringUtils.isBlank(register_email)) {
errorMessages.put(EMAIL_REGISTER, REGISTER_EMAIL_EMPTY);
- } else if (!isEmailAddress(register_email)) {
+ } else if (!EmailSender.isEmailAddress(register_email)) {
errorMessages.put(EMAIL_REGISTER, REGISTER_EMAIL_MATCH);
}
AuthenticationService authenticationService = (AuthenticationService)
ApplicationContextFactory.getBean("authenticationService");
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-maileditors/src/java/com/finalist/portlets/reactform/ReactFormPortlet.java
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-maileditors/src/java/com/finalist/portlets/reactform/ReactFormPortlet.java
2009-06-05 10:42:17 UTC (rev 35763)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-maileditors/src/java/com/finalist/portlets/reactform/ReactFormPortlet.java
2009-06-05 11:14:06 UTC (rev 35764)
@@ -20,8 +20,8 @@
import org.mmbase.bridge.*;
import com.finalist.cmsc.mmbase.EmailUtil;
-import com.finalist.cmsc.mmbase.PropertiesUtil;
import com.finalist.cmsc.portlets.ContentPortlet;
+import com.finalist.cmsc.util.EmailSender;
import com.finalist.pluto.portalImpl.core.CmscPortletMode;
public class ReactFormPortlet extends ContentPortlet {
@@ -45,14 +45,13 @@
if (StringUtils.isBlank(articleNumber)) {
errorMessages.put("subject", "view.error.nosubject");
}
- String emailRegex = PropertiesUtil.getProperty("email.regex");
if (StringUtils.isBlank(name)) {
errorMessages.put("name", "view.name.empty");
}
if (StringUtils.isBlank(useremail)) {
errorMessages.put("useremail", "view.useremail.empty");
}
- else if (!useremail.matches(emailRegex)) {
+ else if (!EmailSender.isEmailAddress(useremail)) {
errorMessages.put("useremail", "view.useremail.invalid");
}
if (StringUtils.isBlank(message)) {
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-mailfriend/src/java/com/finalist/portlets/mailfriend/MailFriendPortlet.java
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-mailfriend/src/java/com/finalist/portlets/mailfriend/MailFriendPortlet.java
2009-06-05 10:42:17 UTC (rev 35763)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-mailfriend/src/java/com/finalist/portlets/mailfriend/MailFriendPortlet.java
2009-06-05 11:14:06 UTC (rev 35764)
@@ -20,8 +20,8 @@
import org.mmbase.bridge.*;
import com.finalist.cmsc.mmbase.EmailUtil;
-import com.finalist.cmsc.mmbase.PropertiesUtil;
import com.finalist.cmsc.portlets.ContentPortlet;
+import com.finalist.cmsc.util.EmailSender;
import com.finalist.pluto.portalImpl.core.CmscPortletMode;
public class MailFriendPortlet extends ContentPortlet {
@@ -45,14 +45,13 @@
if (StringUtils.isBlank(articleNumber)) {
errorMessages.put("article", "view.error.noarticle");
}
- String emailRegex = PropertiesUtil.getProperty("email.regex");
if (StringUtils.isBlank(fromname)) {
errorMessages.put("fromname", "view.fromname.empty");
}
if (StringUtils.isBlank(fromemail)) {
errorMessages.put("fromemail", "view.fromemail.empty");
}
- else if (!fromemail.matches(emailRegex)) {
+ else if (!EmailSender.isEmailAddress(fromemail)) {
errorMessages.put("fromemail", "view.fromemail.invalid");
}
if (StringUtils.isBlank(toname)) {
@@ -61,7 +60,7 @@
if (StringUtils.isBlank(toemail)) {
errorMessages.put("toemail", "view.toemail.empty");
}
- else if (!toemail.matches(emailRegex)) {
+ else if (!EmailSender.isEmailAddress(toemail)) {
errorMessages.put("toemail", "view.toemail.invalid");
}
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter/UnsubscribePortlet.java
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter/UnsubscribePortlet.java
2009-06-05 10:42:17 UTC (rev 35763)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter/UnsubscribePortlet.java
2009-06-05 11:14:06 UTC (rev 35764)
@@ -41,7 +41,7 @@
Map<String, String> errorMessages = new HashMap<String, String>();
if (StringUtils.isBlank(email)) {
errorMessages.put(EMAIL_UNSUBSCRIBE, REGISTER_EMAIL_EMPTY);
- } else if (!isEmailAddress(email)) {
+ } else if (!EmailSender.isEmailAddress(email)) {
errorMessages.put(EMAIL_UNSUBSCRIBE, REGISTER_EMAIL_MATCH);
} else {
NewsletterSubscriptionServices newsletterSubscriptionServices =
(NewsletterSubscriptionServices) ApplicationContextFactory
@@ -61,7 +61,7 @@
template = getConfirmationTemplate();
}
String emailText = formatEmailText(template, email);
- if (!isEmailAddress(emailFrom)) {
+ if (!EmailSender.isEmailAddress(emailFrom)) {
errorMessages.put(ACEGI_SECURITY_DEFAULT, "Email address '" +
emailFrom
+ "' set in the edit_defaults properties is not available
or working!");
} else {
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-preferences/src/java/com/finalist/portlets/preferences/ProfilePortlet.java
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-preferences/src/java/com/finalist/portlets/preferences/ProfilePortlet.java
2009-06-05 10:42:17 UTC (rev 35763)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-preferences/src/java/com/finalist/portlets/preferences/ProfilePortlet.java
2009-06-05 11:14:06 UTC (rev 35764)
@@ -17,6 +17,7 @@
import com.finalist.cmsc.portlets.CmscPortlet;
import com.finalist.cmsc.services.community.domain.PreferenceVO;
+import com.finalist.cmsc.util.EmailSender;
import com.finalist.preferences.domain.UserProfile;
import com.finalist.preferences.util.ProfileUtil;
@@ -92,7 +93,7 @@
if (StringUtils.isBlank(profile.getEmail())) {
bf.append("community.profile.email.empty,");
}
- else if(!ProfileUtil.isEmail(profile.getEmail())) {
+ else if(!EmailSender.isEmailAddress(profile.getEmail())) {
bf.append("community.profile.email.incorrect,");
}
if (StringUtils.isNotBlank(profile.getPasswordText()) &&
StringUtils.isNotBlank(profile.getPasswordConfirmation())) {
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-preferences/src/java/com/finalist/preferences/util/ProfileUtil.java
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-preferences/src/java/com/finalist/preferences/util/ProfileUtil.java
2009-06-05 10:42:17 UTC (rev 35763)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-preferences/src/java/com/finalist/preferences/util/ProfileUtil.java
2009-06-05 11:14:06 UTC (rev 35764)
@@ -4,8 +4,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import org.acegisecurity.context.SecurityContext;
import org.acegisecurity.context.SecurityContextHolder;
@@ -180,10 +178,4 @@
return (PreferenceService)
ApplicationContextFactory.getBean("preferenceService");
}
- public static boolean isEmail(String s) {
- String regex = "[a-za-z][\\w_]+.?[\\w...@\\w+(\\.\\w+)+";
- Pattern p = Pattern.compile(regex);
- Matcher m = p.matcher(s);
- return m.matches();
- }
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
