You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by pa...@apache.org on 2020/01/29 07:30:29 UTC
[ofbiz-framework] branch release17.12 updated: Revert "Fixed:
Potensial bug under CommunicationEventServices#updateCommEventAfterEmail
for CommunicationEvent.subject field" (OFBIZ-10879)
This is an automated email from the ASF dual-hosted git repository.
pawan pushed a commit to branch release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release17.12 by this push:
new a273531 Revert "Fixed: Potensial bug under CommunicationEventServices#updateCommEventAfterEmail for CommunicationEvent.subject field" (OFBIZ-10879)
a273531 is described below
commit a2735318232cbe2518e3c05f7f026ac5ec55a29a
Author: Pawan Verma <pa...@hotwaxsystems.com>
AuthorDate: Wed Jan 29 12:59:59 2020 +0530
Revert "Fixed: Potensial bug under CommunicationEventServices#updateCommEventAfterEmail for CommunicationEvent.subject field"
(OFBIZ-10879)
This reverts commit 9706acf064e26c291c0bd10081df8286ae6b359b.
---
.../communication/CommunicationEventServices.java | 23 ----------------------
1 file changed, 23 deletions(-)
diff --git a/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java b/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java
index 507d97c..759008f 100644
--- a/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java
+++ b/applications/party/src/main/java/org/apache/ofbiz/party/communication/CommunicationEventServices.java
@@ -43,7 +43,6 @@ import javax.mail.internet.InternetAddress;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang.StringUtils;
import org.apache.ofbiz.base.location.FlexibleLocation;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.GeneralException;
@@ -608,7 +607,6 @@ public class CommunicationEventServices {
*/
public static Map<String, Object> updateCommEventAfterEmail(DispatchContext dctx, Map<String, ? extends Object> context) {
LocalDispatcher dispatcher = dctx.getDispatcher();
- Delegator delegator = dctx.getDelegator();
GenericValue userLogin = (GenericValue) context.get("userLogin");
String communicationEventId = (String) context.get("communicationEventId");
@@ -624,27 +622,6 @@ public class CommunicationEventServices {
commEventMap.put("userLogin", userLogin);
commEventMap.put("content", wrapper.getMessageBody());
- String subject = wrapper.getSubject();
- String redirectAddress = EntityUtilProperties.getPropertyValue("general",
- "mail.notifications.redirectTo", delegator);
- if (UtilValidate.isNotEmpty(redirectAddress) && subject.endsWith("]") && subject.contains(" [To: ")) {
- // Format of subject for redirected mail from sendMail service:
- // "Original subject [To: <sendTo>, Cc: <sendCc>, Bcc: <sendBcc>]"
- String origSendTo = StringUtils.substringBetween(subject, "[To: ", ", Cc:");
- String origSendCc = StringUtils.substringBetween(subject, ", Cc: ", ", Bcc:");
- String origSendBcc = StringUtils.substringBetween(subject, ", Bcc: ", "]");
-
- // ignore "null" Strings in subject
- if (origSendTo != "null") commEventMap.put("toString", origSendTo);
- if (origSendCc != "null") commEventMap.put("ccString", origSendCc);
- if (origSendBcc != "null") commEventMap.put("bccString", origSendBcc);
-
- // Format of subject in commEvent: "Original subject [RedirectedTo: recipient@example.com]"
- subject = StringUtils.substringBefore(subject, "[To: ")
- + "[RedirectedTo: " + commEventMap.get("fromString") + "]";
- commEventMap.put("subject", StringUtils.abbreviate(subject, 255));
- }
-
// populate the address (to/from/cc/bcc) data
populateAddressesFromMessage(wrapper, commEventMap);