[Yanel-commits] rev 20311 - public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources

[josias at wyona.com]

Author: josias
Date: 2006-11-24 16:43:53 +0100 (Fri, 24 Nov 2006)
New Revision: 20311

Modified:
   public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/ContactResource.java
Log:
applied third patch for bug #5056: show error message for invalid email

Modified: public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/ContactResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/ContactResource.java	2006-11-24 15:12:03 UTC (rev 20310)
+++ public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/ContactResource.java	2006-11-24 15:43:53 UTC (rev 20311)
@@ -220,7 +220,12 @@
             sb.append("<div id=\"contenBody\">");
             sb.append("<h1>" + status.get(SendMail.STATUS) + "</h1>");
             sb.append("<p>Your message has not been sent.</p>");
-            sb.append("<p>" + status.get(SendMail.MESSAGE) + "</p>");
+            
+            String errorMessage = (String) status.get(SendMail.MESSAGE);
+            errorMessage = errorMessage.replaceAll("<", "&lt;");
+            errorMessage = errorMessage.replaceAll(">", "&gt;");
+            
+            sb.append("<p>" + errorMessage + "</p>");
             sb.append("</div>");
             sb.append("</body>");
         }
@@ -241,6 +246,7 @@
         transformer.setParameter("yarep.back2realm", backToRoot(new org.wyona.yanel.core.Path(rp.getPath().toString()), ""));
         // TODO: Is this the best way to generate an InputStream from an
         // OutputStream?
+        
         java.io.ByteArrayOutputStream baos = new java.io.ByteArrayOutputStream();
         transformer.transform(new StreamSource(
                 new java.io.StringBufferInputStream(sb.toString())),