OFBiz › OFBiz - Commits

svn commit: r743056 - /ofbiz/trunk/applications/content/servicedef/services_email.xml

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 2 messages Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r743056 - /ofbiz/trunk/applications/content/servicedef/services_email.xml

jleroux@apache.org
Author: jleroux
Date: Tue Feb 10 18:46:17 2009
New Revision: 743056

URL: http://svn.apache.org/viewvc?rev=743056&view=rev
Log:
This should fix most of the sent emails issues for now. To be double checked please...

Modified:
    ofbiz/trunk/applications/content/servicedef/services_email.xml

Modified: ofbiz/trunk/applications/content/servicedef/services_email.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_email.xml?rev=743056&r1=743055&r2=743056&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/servicedef/services_email.xml (original)
+++ ofbiz/trunk/applications/content/servicedef/services_email.xml Tue Feb 10 18:46:17 2009
@@ -46,7 +46,7 @@
         <description>Send E-Mail Service.  partyId and communicationEventId aren't used by sendMail
             but are passed down to storeEmailAsCommunication during the SECA chain.  See sednMailInterface for more comments.</description>
         <implements service="sendMailInterface"/>
-        <attribute name="body" type="String" mode="INOUT" optional="false"/>
+        <attribute name="body" type="String" mode="INOUT" optional="false" allow-html="any"/>
         <attribute name="communicationEventId" type="String" mode="INOUT" optional="true"/>
         <override name="contentType" mode="INOUT"/>
         <override name="subject" mode="INOUT" optional="false"/>
@@ -67,14 +67,14 @@
         <implements service="sendMailInterface"/>
         <attribute name="bodyUrl" type="String" mode="IN" optional="false"/>
         <attribute name="bodyUrlParameters" type="Map" mode="IN" optional="true"/>
-        <attribute name="body" type="String" mode="OUT" optional="false"/>
+        <attribute name="body" type="String" mode="OUT" optional="false" allow-html="any"/>
     </service>
     <service name="sendMailFromScreen" max-retry="3" engine="java"
         location="org.ofbiz.content.email.EmailServices" invoke="sendMailFromScreen">
         <description>Send E-Mail From Screen Widget Service</description>
         <implements service="sendMailInterface"/>
-        <attribute name="bodyText" type="String" mode="IN" optional="true"/>
-        <attribute name="bodyScreenUri" type="String" mode="IN" optional="true"/>
+        <attribute name="bodyText" type="String" mode="IN" optional="true" allow-html="any"/>
+        <attribute name="bodyScreenUri" type="String" mode="IN" optional="true" allow-html="any"/>
         <attribute name="xslfoAttachScreenLocation" type="String" mode="IN" optional="true"/>
         <attribute name="attachmentName" type="String" mode="IN" optional="true"/>
         <attribute name="bodyParameters" type="Map" mode="IN" optional="true"/>
@@ -86,8 +86,8 @@
             location="" invoke="">
         <description>Send Template Based Notification Service</description>
         <implements service="sendMailInterface"/>
-        <attribute name="body" type="String" mode="INOUT" optional="true"/>
-        <attribute name="baseUrl" type="String" mode="IN" optional="true"/>
+        <attribute name="body" type="String" mode="INOUT" optional="true" allow-html="any"/>
+        <attribute name="baseUrl" type="String" mode="IN" optional="true" allow-html="any"/>
         <attribute name="templateName" type="String" mode="IN" optional="false"/>
         <attribute name="templateData" type="Map" mode="IN" optional="true"/>
         <attribute name="webSiteId" type="String" mode="IN" optional="true"/>
@@ -96,7 +96,7 @@
             location="" invoke="">
         <description>Send Template Based Notification Service</description>
         <implements service="prepareNotificationInterface"/>
-        <attribute name="body" type="String" mode="IN" optional="true"/>
+        <attribute name="body" type="String" mode="IN" optional="true" allow-html="any"/>
         <attribute name="templateName" type="String" mode="IN" optional="false"/>
         <attribute name="templateData" type="Map" mode="IN" optional="true"/>
         <attribute name="webSiteId" type="String" mode="IN" optional="true"/>
@@ -114,7 +114,7 @@
         <attribute name="partyId" type="String" mode="IN" optional="true"/>
         <attribute name="communicationEventId" type="String" mode="IN" optional="true"/>
         <attribute name="subject" type="String" mode="IN" optional="false"/>
-        <attribute name="body" type="String" mode="IN" optional="false"/>
+        <attribute name="body" type="String" mode="IN" optional="false" allow-html="any"/>
         <attribute name="contentType" type="String" mode="IN" optional="true"/>
         <attribute name="emailType" type="String" mode="IN" optional="true"/>
     </service>


jonesde
Reply | Threaded
Open this post in threaded view
♦
♦
|

Re: svn commit: r743056 - /ofbiz/trunk/applications/content/servicedef/services_email.xml

jonesde

Jacques,

It looks like all of these use "any". Is there are reason you thought  
the "safe" HTML would not be sufficient?

-David


On Feb 10, 2009, at 11:46 AM, [hidden email] wrote:

> Author: jleroux
> Date: Tue Feb 10 18:46:17 2009
> New Revision: 743056
>
> URL: http://svn.apache.org/viewvc?rev=743056&view=rev
> Log:
> This should fix most of the sent emails issues for now. To be double  
> checked please...
>
> Modified:
>    ofbiz/trunk/applications/content/servicedef/services_email.xml
>
> Modified: ofbiz/trunk/applications/content/servicedef/
> services_email.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_email.xml?rev=743056&r1=743055&r2=743056&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/content/servicedef/services_email.xml  
> (original)
> +++ ofbiz/trunk/applications/content/servicedef/services_email.xml  
> Tue Feb 10 18:46:17 2009
> @@ -46,7 +46,7 @@
>         <description>Send E-Mail Service.  partyId and  
> communicationEventId aren't used by sendMail
>             but are passed down to storeEmailAsCommunication during  
> the SECA chain.  See sednMailInterface for more comments.</
> description>
>         <implements service="sendMailInterface"/>
> -        <attribute name="body" type="String" mode="INOUT"  
> optional="false"/>
> +        <attribute name="body" type="String" mode="INOUT"  
> optional="false" allow-html="any"/>
>         <attribute name="communicationEventId" type="String"  
> mode="INOUT" optional="true"/>
>         <override name="contentType" mode="INOUT"/>
>         <override name="subject" mode="INOUT" optional="false"/>
> @@ -67,14 +67,14 @@
>         <implements service="sendMailInterface"/>
>         <attribute name="bodyUrl" type="String" mode="IN"  
> optional="false"/>
>         <attribute name="bodyUrlParameters" type="Map" mode="IN"  
> optional="true"/>
> -        <attribute name="body" type="String" mode="OUT"  
> optional="false"/>
> +        <attribute name="body" type="String" mode="OUT"  
> optional="false" allow-html="any"/>
>     </service>
>     <service name="sendMailFromScreen" max-retry="3" engine="java"
>         location="org.ofbiz.content.email.EmailServices"  
> invoke="sendMailFromScreen">
>         <description>Send E-Mail From Screen Widget Service</
> description>
>         <implements service="sendMailInterface"/>
> -        <attribute name="bodyText" type="String" mode="IN"  
> optional="true"/>
> -        <attribute name="bodyScreenUri" type="String" mode="IN"  
> optional="true"/>
> +        <attribute name="bodyText" type="String" mode="IN"  
> optional="true" allow-html="any"/>
> +        <attribute name="bodyScreenUri" type="String" mode="IN"  
> optional="true" allow-html="any"/>
>         <attribute name="xslfoAttachScreenLocation" type="String"  
> mode="IN" optional="true"/>
>         <attribute name="attachmentName" type="String" mode="IN"  
> optional="true"/>
>         <attribute name="bodyParameters" type="Map" mode="IN"  
> optional="true"/>
> @@ -86,8 +86,8 @@
>             location="" invoke="">
>         <description>Send Template Based Notification Service</
> description>
>         <implements service="sendMailInterface"/>
> -        <attribute name="body" type="String" mode="INOUT"  
> optional="true"/>
> -        <attribute name="baseUrl" type="String" mode="IN"  
> optional="true"/>
> +        <attribute name="body" type="String" mode="INOUT"  
> optional="true" allow-html="any"/>
> +        <attribute name="baseUrl" type="String" mode="IN"  
> optional="true" allow-html="any"/>
>         <attribute name="templateName" type="String" mode="IN"  
> optional="false"/>
>         <attribute name="templateData" type="Map" mode="IN"  
> optional="true"/>
>         <attribute name="webSiteId" type="String" mode="IN"  
> optional="true"/>
> @@ -96,7 +96,7 @@
>             location="" invoke="">
>         <description>Send Template Based Notification Service</
> description>
>         <implements service="prepareNotificationInterface"/>
> -        <attribute name="body" type="String" mode="IN"  
> optional="true"/>
> +        <attribute name="body" type="String" mode="IN"  
> optional="true" allow-html="any"/>
>         <attribute name="templateName" type="String" mode="IN"  
> optional="false"/>
>         <attribute name="templateData" type="Map" mode="IN"  
> optional="true"/>
>         <attribute name="webSiteId" type="String" mode="IN"  
> optional="true"/>
> @@ -114,7 +114,7 @@
>         <attribute name="partyId" type="String" mode="IN"  
> optional="true"/>
>         <attribute name="communicationEventId" type="String"  
> mode="IN" optional="true"/>
>         <attribute name="subject" type="String" mode="IN"  
> optional="false"/>
> -        <attribute name="body" type="String" mode="IN"  
> optional="false"/>
> +        <attribute name="body" type="String" mode="IN"  
> optional="false" allow-html="any"/>
>         <attribute name="contentType" type="String" mode="IN"  
> optional="true"/>
>         <attribute name="emailType" type="String" mode="IN"  
> optional="true"/>
>     </service>
>
>

Free forum by Nabble Edit this page