Merge pull request #574 from wrooot/master

OF-1120 Additional fix for the default behavior

src/plugins/emailOnAway/changelog.html

@@ -44,6 +44,11 @@
 Email on Away Plugin Changelog
 </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>
 <ul>
     <li>[<a href='http://www.igniterealtime.org/issues/browse/OF-1120'>OF-1120</a>] Change default behavior of Email on Away plugin</li>

src/plugins/emailOnAway/plugin.xml

@@ -6,8 +6,8 @@
     <name>Email on Away</name>
     <description>Messages sent to alternate location when recipient is away</description>
     <author>Nick Mossie</author>
-    <version>1.0.2</version>
-    <date>03/26/2016</date>
+    <version>1.0.3</version>
+    <date>04/10/2016</date>
     <minServerVersion>2.3.0</minServerVersion>
 
 </plugin>

src/plugins/emailOnAway/readme.html

@@ -58,8 +58,8 @@ installation or install it via Admin Console. The plugin will then be automatica
 <h2>Configuration</h2>
 <p>
 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
-the value "true".
+To not show email in the automated message create a system property "plugin.emailonaway.showemail" with
+the value "false".
 </p>
 
 </body>

src/plugins/emailOnAway/src/java/com/tempstop/emailOnAway.java

@@ -54,9 +54,9 @@ public class emailOnAway implements Plugin, PacketInterceptor {
         message.setTo(to);
         message.setFrom(from);
         message.setSubject("I'm away");
-        if (JiveGlobals.getBooleanProperty("plugin.emailonaway.hideemail", true)) { 
-        	message.setBody( "I'm currently away. Your message has been forwarded to my email address." ); 
-        	} else { message.setBody( "I'm currently away. Your message has been forwarded to my email address (" + emailTo + ")." ); }
+        if (JiveGlobals.getBooleanProperty("plugin.emailonaway.showemail", true)) { 
+        	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;
     }