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

[michi at wyona.com]

Author: michi
Date: 2010-01-27 09:22:25 +0100 (Wed, 27 Jan 2010)
New Revision: 47259

Modified:
   public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/ContactResource.java
Log:
sending of email fixed

Modified: public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/ContactResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/ContactResource.java	2010-01-26 22:37:31 UTC (rev 47258)
+++ public/yanel/trunk/src/contributions/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/ContactResource.java	2010-01-27 08:22:25 UTC (rev 47259)
@@ -174,6 +174,9 @@
             return defaultView;
     }
 
+    /**
+     *
+     */
     private void sendMail(Transformer transformer) throws Exception {
         String email = getEnvironment().getRequest().getParameter("email");
         if(email == null || ("").equals(email)) {
@@ -183,14 +186,7 @@
             transformer.setParameter("error", "emailNotValid");
         } else {
             contact = new ContactBean(request);
-            smtpHost = getResourceConfigProperty(SMTP_HOST);
-            try {
-                smtpPort = Integer.parseInt(getResourceConfigProperty(SMTP_PORT));
-            } catch(NumberFormatException nfe) {
-                log.error(nfe);
-                transformer.setParameter("error", "smtpPortNotCorrect");
-                smtpPort = 0;
-            }
+
             String subject = getResourceConfigProperty(SUBJECT);
             if (subject == null) subject = "Yanel Contact Resource: No subject specified";
             to = getResourceConfigProperty(TO);
@@ -209,22 +205,38 @@
             if (contact.getEmail() != null) content = content + "E-Mail: " + contact.getEmail() + "\n" + "\n";
             if (contact.message != null) content = content + "Message:\n" + contact.message;
 
-            if(smtpHost != null && smtpPort != 0 && to != null) {
+
+            if(to != null) {
                 try {
-                    SendMail.send(smtpHost, smtpPort, from, to, subject, content);
-                    transformer.setParameter("sent", "true");
-                } catch(javax.mail.MessagingException me) {
-                    log.error("#" + me + "#");
-                    if(("" + me).startsWith("javax.mail.MessagingException: Unknown SMTP")) {
+                    smtpHost = getResourceConfigProperty(SMTP_HOST);
+                    String smtpPortAsString = getResourceConfigProperty(SMTP_PORT);
+                    if(smtpHost != null && smtpPortAsString != null) {
+                        try {
+                            smtpPort = Integer.parseInt(smtpPortAsString);
+                            SendMail.send(smtpHost, smtpPort, from, to, subject, content);
+                            transformer.setParameter("sent", "true");
+                        } catch(NumberFormatException nfe) {
+                            log.error(nfe);
+                            transformer.setParameter("error", "smtpPortNotCorrect");
+                            smtpPort = 0;
+                        }
+                    } else {
+                        // INFO: Use default settings of Yanel for smtp-host and smtp-port
+                        SendMail.send(null, -1, from, to, subject, content);
+                        transformer.setParameter("sent", "true");
+                    }
+                } catch(javax.mail.MessagingException e) {
+                    log.error(e, e);
+                    if(("" + e).startsWith("javax.mail.MessagingException: Unknown SMTP")) {
                         transformer.setParameter("error", "unknownHost");
-                    } else if(("" + me).startsWith("javax.mail.SendFailedException: Invalid Addresses")) {
+                    } else if(("" + e).startsWith("javax.mail.SendFailedException: Invalid Addresses")) {
                         transformer.setParameter("error", "invalidAddress");
                     } else {
                         transformer.setParameter("error", "couldNotSendMail");
                     }
                 }
             } else {
-                transformer.setParameter("error", "smtpConfigError");
+                transformer.setParameter("error", "smtpConfigError"); // INFO: Also see conf/contact-form_en.properties
             }
         }
     }