[Aplaws-commit] r1084 - in releases/1.0.3/ccm-core: . src/com/arsdigita/formbuilder/actions

[<ssk...@vh...>]

Author: sskracic
Date: 2006-01-30 17:32:25 +0100 (Mon, 30 Jan 2006)
New Revision: 1084

Modified:
   releases/1.0.3/ccm-core/application.xml
   releases/1.0.3/ccm-core/src/com/arsdigita/formbuilder/actions/SimpleEmailListener.java
Log:
  Integrating r1083 (provide default From: address) onto 1.0.3 branch.


Modified: releases/1.0.3/ccm-core/application.xml
===================================================================
--- releases/1.0.3/ccm-core/application.xml	2006-01-30 16:20:00 UTC (rev 1083)
+++ releases/1.0.3/ccm-core/application.xml	2006-01-30 16:32:25 UTC (rev 1084)
@@ -3,7 +3,7 @@
   name="ccm-core"
   prettyName="Core"
   version="6.2.0"
-  release="4"
+  release="5"
   webapp="ROOT"
   buildHooks="build-hooks.xml">
   <ccm:dependencies>

Modified: releases/1.0.3/ccm-core/src/com/arsdigita/formbuilder/actions/SimpleEmailListener.java
===================================================================
--- releases/1.0.3/ccm-core/src/com/arsdigita/formbuilder/actions/SimpleEmailListener.java	2006-01-30 16:20:00 UTC (rev 1083)
+++ releases/1.0.3/ccm-core/src/com/arsdigita/formbuilder/actions/SimpleEmailListener.java	2006-01-30 16:32:25 UTC (rev 1084)
@@ -157,9 +157,10 @@
             String subject = p.interpolate(m_subject);
 
             String from = (String) p.interpolate("::user.email::");
-                if (null == from) {
+
+            if (null == from) {
                 User user = (User) Kernel.getContext().getParty();
-                if( null == user ) {
+                if (null == user) {
                     from = Mail.getConfig().getDefaultFrom();
                 } else {
                     from = user.getPrimaryEmail().getEmailAddress();
@@ -168,7 +169,12 @@
 
             StringBuffer body = new StringBuffer();
 
-            body.append(from);
+            if (from == null || from.trim().length() == 0) {
+                body.append("Anonymous visitor");
+                from = Kernel.getSecurityConfig().getAdminContactEmail();
+            } else {
+                body.append(from);
+            }
             body.append(" submitted the following:\n\n");
 
             String submit = null;