Commit 8c58b7ab authored by wroot's avatar wroot

OF-1120 Additional fix for the default behavior

parent 279a998f
...@@ -44,6 +44,11 @@ ...@@ -44,6 +44,11 @@
Email on Away Plugin Changelog Email on Away Plugin Changelog
</h1> </h1>
<p><b>1.0.3</b> -- April 10, 2016</p>
<ul>
<li>[<a href='http://www.igniterealtime.org/issues/browse/OF-1120'>OF-1120</a>] Additional fix for the default behavior</li>
</ul>
<p><b>1.0.2</b> -- March 26, 2016</p> <p><b>1.0.2</b> -- March 26, 2016</p>
<ul> <ul>
<li>[<a href='http://www.igniterealtime.org/issues/browse/OF-1120'>OF-1120</a>] Change default behavior of Email on Away plugin</li> <li>[<a href='http://www.igniterealtime.org/issues/browse/OF-1120'>OF-1120</a>] Change default behavior of Email on Away plugin</li>
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<name>Email on Away</name> <name>Email on Away</name>
<description>Messages sent to alternate location when recipient is away</description> <description>Messages sent to alternate location when recipient is away</description>
<author>Nick Mossie</author> <author>Nick Mossie</author>
<version>1.0.2</version> <version>1.0.3</version>
<date>03/26/2016</date> <date>04/10/2016</date>
<minServerVersion>2.3.0</minServerVersion> <minServerVersion>2.3.0</minServerVersion>
</plugin> </plugin>
...@@ -58,8 +58,8 @@ installation or install it via Admin Console. The plugin will then be automatica ...@@ -58,8 +58,8 @@ installation or install it via Admin Console. The plugin will then be automatica
<h2>Configuration</h2> <h2>Configuration</h2>
<p> <p>
Configuration can be changed and tested in Admin Console > Server Manager > Email settings. Configuration can be changed and tested in Admin Console > Server Manager > Email settings.
To not show email in the automated message create a system property "plugin.emailonaway.hideemail" with To not show email in the automated message create a system property "plugin.emailonaway.showemail" with
the value "true". the value "false".
</p> </p>
</body> </body>
......
...@@ -54,9 +54,9 @@ public class emailOnAway implements Plugin, PacketInterceptor { ...@@ -54,9 +54,9 @@ public class emailOnAway implements Plugin, PacketInterceptor {
message.setTo(to); message.setTo(to);
message.setFrom(from); message.setFrom(from);
message.setSubject("I'm away"); message.setSubject("I'm away");
if (JiveGlobals.getBooleanProperty("plugin.emailonaway.hideemail", true)) { if (JiveGlobals.getBooleanProperty("plugin.emailonaway.showemail", true)) {
message.setBody( "I'm currently away. Your message has been forwarded to my email address." ); message.setBody("I'm currently away. Your message has been forwarded to my email address (" + emailTo + ").");
} else { message.setBody( "I'm currently away. Your message has been forwarded to my email address (" + emailTo + ")." ); } } else { message.setBody("I'm currently away. Your message has been forwarded to my email address."); }
return message; return message;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment