Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform
In directory
james.mmbase.org:/tmp/cvs-serv17840/portlets-dynamicforms/src/java/com/finalist/portlets/responseform
Modified Files:
Tag: b1_4
ResponseFormPortlet.java
Log Message:
CMSC-999 - Dynamic Form does not accept form when whitespaces are added in the
form (backend)
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform
See also: http://www.mmbase.org/jira/browse/CMSC-999
Index: ResponseFormPortlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform/ResponseFormPortlet.java,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -u -b -r1.8.2.4 -r1.8.2.5
--- ResponseFormPortlet.java 8 May 2008 03:15:07 -0000 1.8.2.4
+++ ResponseFormPortlet.java 4 Jul 2008 16:23:28 -0000 1.8.2.5
@@ -32,7 +32,7 @@
import javax.portlet.RenderResponse;
import net.sf.mmapps.commons.bridge.RelationUtil;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import net.sf.mmapps.modules.cloudprovider.CloudProvider;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
@@ -70,7 +70,7 @@
private static final int TYPE_CHECKBOX = 6;
private static final int TYPE_ATTACHEMENT = 7;
private static final String CHECKBOX_NO = "nee";
- private static final String CHECKBOX_YES = "ja";
+// private static final String CHECKBOX_YES = "ja";
private static final String RADIO_EMPTY = "[niets gekozen]";
private static final String TEXTBOX_EMPTY = "[niet ingevuld]";
private static final String REGEX = " ";
@@ -116,7 +116,7 @@
Object value = parameterMap.get(fieldIdentifier);
String textValue = null;
if (sendEmail) {
- userEmailAddress = value.toString();
+ userEmailAddress = value.toString().trim();
}
if (type == TYPE_TEXTAREA && value != null && maxlength > 0
&& value.toString().length() > maxlength) {
errorMessages.put(fieldIdentifier,
Integer.valueOf(maxlength).toString());
@@ -252,9 +252,9 @@
protected boolean sendUserEmail(Node responseform, String userEmailAddress,
String responseformData,
Map<String, Object> parameterMap) {
boolean sent = false;
- String userEmailSubject =
responseform.getStringValue("useremailsubject");
- String userEmailSenderAddress =
responseform.getStringValue("useremailsender");
- String userEmailSenderName =
responseform.getStringValue("useremailsendername");
+ String userEmailSubject =
responseform.getStringValue("useremailsubject").trim();
+ String userEmailSenderAddress =
responseform.getStringValue("useremailsender").trim();
+ String userEmailSenderName =
responseform.getStringValue("useremailsendername").trim();
String userEmailTextBefore =
responseform.getStringValue("useremailbody");
String userEmailTextAfter =
responseform.getStringValue("useremailbodyafter");
boolean includedata = responseform.getBooleanValue("includedata");
@@ -272,8 +272,8 @@
userEmailText.append(userEmailTextAfter);
}
- if (!StringUtil.isEmptyOrWhitespace(userEmailText.toString())
- && !StringUtil.isEmptyOrWhitespace(userEmailSenderName)
+ if (StringUtils.isNotBlank(userEmailText.toString())
+ && StringUtils.isNotBlank(userEmailSenderName)
&& isEmailAddress(userEmailAddress)
&& isEmailAddress(userEmailSenderAddress)) {
try {
@@ -298,7 +298,7 @@
}
- private boolean sendResponseFormEmail(Node responseform, String
userEmailAddress, String responseformData,
+ private boolean sendResponseFormEmail(Node responseform, final String
userEmailAddress, String responseformData,
DataSource attachment) {
boolean sent = false;
StringBuffer emailText = new StringBuffer();
@@ -308,9 +308,9 @@
String senderEmailAddress = userEmailAddress;
String senderName = userEmailAddress;
- if (StringUtil.isEmptyOrWhitespace(userEmailAddress)) {
- senderEmailAddress = responseform.getStringValue("useremailsender");
- senderName = responseform.getStringValue("useremailsendername");
+ if (StringUtils.isBlank(userEmailAddress)) {
+ senderEmailAddress =
responseform.getStringValue("useremailsender").trim();
+ senderName =
responseform.getStringValue("useremailsendername").trim();
}
if (!isEmailAddress(senderEmailAddress)) return false; //Last check
email address
@@ -324,8 +324,8 @@
emailText.append(emailTextAfter);
}
- String emailAddressesValue =
responseform.getStringValue("emailaddresses");
- String emailSubject = responseform.getStringValue("emailsubject");
+ String emailAddressesValue =
responseform.getStringValue("emailaddresses").replaceAll(" ","");
+ String emailSubject = responseform.getStringValue("emailsubject").trim();
List<String> emailList = Arrays.asList(emailAddressesValue.split(";"));
if (!isEmailAddress(emailList)) {
getLogger().error("error sending email. Some of the following
emailaddresses are incorrect: " + emailList.toString());
@@ -453,7 +453,7 @@
}
}
else {
- if (!StringUtil.isEmptyOrWhitespace(fileItem.getName())) {
+ if (StringUtils.isNotBlank(fileItem.getName())) {
if (fileItem.getSize() <= getMaxAttachmentSize()) {
attachment = new WrappedFileItem(fileItem);
}
@@ -471,10 +471,10 @@
public boolean isEmailAddress(String emailAddress) {
if (emailAddress == null) return false;
- if (StringUtil.isEmptyOrWhitespace(emailAddress)) return false;
+ if (StringUtils.isBlank(emailAddress)) return false;
String emailRegex = getEmailRegex();
- return emailAddress.matches(emailRegex);
+ return emailAddress.trim().matches(emailRegex);
}
public boolean isEmailAddress(List<String> emailList) {
@@ -483,7 +483,7 @@
String emailRegex = getEmailRegex();
for (String email : emailList) {
- if (email == null || StringUtil.isEmptyOrWhitespace(email)) return
false;
+ if (email == null || StringUtils.isBlank(email)) return false;
if (!email.matches(emailRegex)) return false;
}
@@ -493,7 +493,7 @@
private long getMaxAttachmentSize() {
long maxFileSize = DEFAULT_MAXFILESIZE;
String maxFileSizeValue =
PropertiesUtil.getProperty("email.maxattachmentsize");
- if (!StringUtil.isEmptyOrWhitespace(maxFileSizeValue)) {
+ if (StringUtils.isNotBlank(maxFileSizeValue)) {
try {
maxFileSize = Integer.parseInt(maxFileSizeValue);
}
@@ -508,7 +508,7 @@
protected String getEmailRegex() {
String emailRegex = PropertiesUtil.getProperty("email.regex");
- if (!StringUtil.isEmptyOrWhitespace(emailRegex)) {
+ if (StringUtils.isNotBlank(emailRegex)) {
return emailRegex;
}
else {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
