From: <de...@de...> - 2012-06-09 00:52:54
|
Author: PeterThoeny Date: 2012-06-08 19:52:29 -0500 (Fri, 08 Jun 2012) New Revision: 22989 Trac url: http://develop.twiki.org/trac/changeset/22989 Modified: twiki/trunk/SendMailPlugin/data/TWiki/SendMailPlugin.txt twiki/trunk/SendMailPlugin/data/TWiki/VarSENDMAIL.txt twiki/trunk/SendMailPlugin/lib/TWiki/Plugins/SendMailPlugin.pm Log: Item6885: Support HTML and MIME Multi-Part E-mail Messages - updating docs Modified: twiki/trunk/SendMailPlugin/data/TWiki/SendMailPlugin.txt =================================================================== --- twiki/trunk/SendMailPlugin/data/TWiki/SendMailPlugin.txt 2012-06-09 00:38:18 UTC (rev 22988) +++ twiki/trunk/SendMailPlugin/data/TWiki/SendMailPlugin.txt 2012-06-09 00:52:29 UTC (rev 22989) @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="TWikiContributor" date="1334099872" format="1.1" version="$Rev$"}% +%META:TOPICINFO{author="TWikiContributor" date="1339203044" format="1.1" version="$Rev$"}% ---+!! !SendMailPlugin <!-- Contributions to this plugin are appreciated. Please update the plugin page at @@ -132,8 +132,9 @@ | Plugin Author: | TWiki:Main.PeterThoeny | | Copyright: | © 2012 Hypertek lnc. <br /> © 2012 TWiki:Main.PeterThoeny <br /> © 2012 TWiki:TWiki.TWikiContributor | | License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) | -| Plugin Version: | 2012-04-10 | +| Plugin Version: | 2012-06-08 | | Change History: | <!-- versions below in reverse order --> | +| 2012-06-08: | TWikibug:Item6885: Support HTML and MIME Multi-Part e-mail messages | | 2012-04-10: | TWikibug:Item6867: Fix for no e-mail sent if =excludetopic= parameter is missing | | 2012-04-02: | TWikibug:Item6837: Add image | | 2012-03-14: | TWikibug:Item6860: Add configure settings; add =excludetopic= parameter; add VarSENDMAIL doc; adding examples | Modified: twiki/trunk/SendMailPlugin/data/TWiki/VarSENDMAIL.txt =================================================================== --- twiki/trunk/SendMailPlugin/data/TWiki/VarSENDMAIL.txt 2012-06-09 00:38:18 UTC (rev 22988) +++ twiki/trunk/SendMailPlugin/data/TWiki/VarSENDMAIL.txt 2012-06-09 00:52:29 UTC (rev 22989) @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="TWikiContributor" date="1331780222" format="1.1" version="$Rev$"}% +%META:TOPICINFO{author="TWikiContributor" date="1339203044" format="1.1" version="$Rev$"}% %META:TOPICPARENT{name="TWikiVariables"}% #VarSENDMAIL ---+++ SENDMAIL{...} -- send e-mail from actions in TWiki topics, useful for workflow automation @@ -13,7 +13,8 @@ | =cc="ji...@ex..."= | CC list: Comma-space delimited list of e-mail addresses. Same tokens supported as in =from=""=. | =""= | | =bcc="bo...@ex..."= | BCC list: Comma-space delimited list of e-mail addresses. Same tokens supported as in =from=""=. | =""= | | =subject="Any text"= | E-mail subject. Text may include %SYSTEMWEB%.TWikiVariables such as =%<nop>URLPARAM{subject}%=, and [[%SYSTEMWEB%.FormatTokens][format tokens]] such as =$n= and =$percnt=. | (help message) | - | =text="Any text"= | E-mail body text. Text may include %SYSTEMWEB%.TWikiVariables and [[%SYSTEMWEB%.FormatTokens][format tokens]]. | (help message) | + | =text="Any text"= or%BR% =plaintext="Any text"= | E-mail body in plain text format. Text may include %SYSTEMWEB%.TWikiVariables and [[%SYSTEMWEB%.FormatTokens][format tokens]]. | (help message) | + | =htmltext="Any HTML"= | E-mail body in HTML format, optional. Text may include %SYSTEMWEB%.TWikiVariables and [[%SYSTEMWEB%.FormatTokens][format tokens]]. Double quotes need to be escaped, such as =<a href=\"http://twiki.org/\">TWiki.org<a>=. A [[http://en.wikipedia.org/wiki/MIME][MIME]] Multi-Part message is sent if both, =plaintext= and =htmltext= are specified. | =""= | | =onsuccess="..."= | Text shown in place of the SENDMAIL variable on success, default is empty. Text may include %SYSTEMWEB%.TWikiVariables and [[%SYSTEMWEB%.FormatTokens][format tokens]]. | =""= | | =onerror="| $error ||"= | Error message shown in place of the SENDMAIL variable on error, if any. Text may include %SYSTEMWEB%.TWikiVariables and [[%SYSTEMWEB%.FormatTokens][format tokens]]. Token =$error= expands to the error message. | ="$error"= |%STOPINCLUDE% * Security: See note on [[SendMailPlugin#OpenMailRelay][how to avoid an open mail relay]] Modified: twiki/trunk/SendMailPlugin/lib/TWiki/Plugins/SendMailPlugin.pm =================================================================== --- twiki/trunk/SendMailPlugin/lib/TWiki/Plugins/SendMailPlugin.pm 2012-06-09 00:38:18 UTC (rev 22988) +++ twiki/trunk/SendMailPlugin/lib/TWiki/Plugins/SendMailPlugin.pm 2012-06-09 00:52:29 UTC (rev 22989) @@ -27,7 +27,7 @@ require TWiki::Plugins; # For the API version our $VERSION = '$Rev$'; -our $RELEASE = '2012-04-10'; +our $RELEASE = '2012-06-08'; # One line description, is shown in the %SYSTEMWEB%.TextFormattingRules topic: our $SHORTDESCRIPTION = 'Send e-mail from actions in TWiki topics, useful for workflow automation'; |