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

[michi at wyona.com]

Author: michi
Date: 2007-09-20 09:30:56 +0200 (Thu, 20 Sep 2007)
New Revision: 27486

Modified:
   public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/ContactResource.java
Log:
from added

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	2007-09-20 07:30:22 UTC (rev 27485)
+++ public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/ContactResource.java	2007-09-20 07:30:56 UTC (rev 27486)
@@ -84,7 +84,6 @@
     private String smtpHost = "";
     private int smtpPort = 25;
     private String to = "";
-    private String from = "";
     private String subject = "Yanel Default Subject";
     private String content = "";
     private ContactBean contact = null;
@@ -163,7 +162,7 @@
                     submit = true;
             }
             if(submit) {
-                sendMail(request, transformer);
+                sendMail(transformer);
                 transformer.setParameter("company", request.getParameter("company"));
                 transformer.setParameter("firstName", request.getParameter("firstName"));
                 transformer.setParameter("lastName", request.getParameter("lastName"));
@@ -284,8 +283,8 @@
      * @param request
      * @param transformer
      */
-    private void sendMail(HttpServletRequest request, Transformer transformer) throws Exception {
-        String email = request.getParameter("email");
+    private void sendMail(Transformer transformer) throws Exception {
+        String email = getRequest().getParameter("email");
         if(email == null || ("").equals(email)) {
             transformer.setParameter("error", "emailNotSet");
         } else if(!validateEmail(email)) {
@@ -302,7 +301,12 @@
             }
             subject = getResourceConfigProperty(SUBJECT);
             to = getResourceConfigProperty(TO);
-            from = email;
+
+            String from = getResourceConfigProperty("from");
+            if (from == null) {
+                from = email;
+            }
+
             content = "Company: " + contact.getCompany() + "\n" + "Firstname: "
                     + contact.getFirstName() + "\n" + "Lastname: "
                     + contact.getLastName() + "\n" + "Address: "