OF-1107 Option to not show email, added readme and changelog

12a26741 · wroot · Christian Schudt · 3d569e25 · 12a26741 · 12a26741
Commit 12a26741 authored Mar 11, 2016 by wroot Committed by Christian Schudt Mar 17, 2016
4 changed files
--- a/src/plugins/emailOnAway/changelog.html
+++ b/src/plugins/emailOnAway/changelog.html
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<title>Email on Away Plugin Changelog</title>
+    <style type="text/css">
+        BODY {
+            font-size : 100%;
+        }
+        BODY, TD, TH {
+            font-family : tahoma, verdana, arial, helvetica, sans-serif;
+            font-size : 0.8em;
+        }
+        H2 {
+             font-size : 10pt;
+             font-weight : bold;
+             padding-left : 1em;
+        }
+        A:hover {
+            text-decoration : none;
+        }
+        H1 {
+            font-family : tahoma, arial, helvetica, sans-serif;
+            font-size : 1.4em;
+            font-weight: bold;
+            border-bottom : 1px #ccc solid;
+            padding-bottom : 2px;
+        }
+      
+        TT {
+            font-family : courier new;
+            font-weight : bold;
+            color : #060;
+        }
+        PRE {
+            font-family : courier new;
+            font-size : 100%;
+        }
+    </style>
+</head>
+<body>
+
+<h1>
+Email on Away Plugin Changelog
+</h1>
+
+<p><b>1.0.1</b> -- March 11, 2016</p>
+<ul>
+    <li>[<a href='http://www.igniterealtime.org/issues/browse/OF-1107'>OF-1107</a>] Option to not expose email address</li>
+    <li>Added readme and changelog (wroot)</li>
+</ul>
+
+
+<p><b>1.0</b> -- December 15, 2005</p>
+
+<ul>
+     <li>Initial release.</li>
+</ul>
+
+</body>
+</html>
\ No newline at end of file
--- a/src/plugins/emailOnAway/plugin.xml
+++ b/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</version>
-    <date>12/15/2005</date>
+    <version>1.0.1</version>
+    <date>03/11/2016</date>
    <minServerVersion>2.3.0</minServerVersion>

 </plugin>
--- a/src/plugins/emailOnAway/readme.html
+++ b/src/plugins/emailOnAway/readme.html
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<title>Email on Away Plugin Readme</title>
+    <style type="text/css">
+        BODY {
+            font-size : 100%;
+        }
+        BODY, TD, TH {
+            font-family : tahoma, verdana, arial, helvetica, sans-serif;
+            font-size : 0.8em;
+        }
+        H2 {
+             font-size : 10pt;
+             font-weight : bold;
+        }
+        A:hover {
+            text-decoration : none;
+        }
+        H1 {
+            font-family : tahoma, arial, helvetica, sans-serif;
+            font-size : 1.4em;
+            font-weight: bold;
+            border-bottom : 1px #ccc solid;
+            padding-bottom : 2px;
+        }
+
+        TT {
+            font-family : courier new;
+            font-weight : bold;
+            color : #060;
+        }
+        PRE {
+            font-family : courier new;
+            font-size : 100%;
+        }
+    </style>
+</head>
+<body>
+
+<h1>
+Email on Away Plugin Readme
+</h1>
+
+<h2>Overview</h2>
+<p>
+The email on away plugin allows to forward messages to user's email address
+when the user is away (not offline).
+</p>
+
+<h2>Installation</h2>
+<p>
+Copy the emailonaway.jar into the plugins directory of your Openfire
+installation or install it via Admin Console. The plugin will then be automatically deployed.
+</p>
+
+<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.showemail" with
+the value "false".
+</p>
+
+</body>
+</html>
\ No newline at end of file
--- a/src/plugins/emailOnAway/src/java/com/tempstop/emailOnAway.java
+++ b/src/plugins/emailOnAway/src/java/com/tempstop/emailOnAway.java
@@ -15,8 +15,6 @@ import org.jivesoftware.openfire.PresenceManager;
 import org.jivesoftware.openfire.vcard.VCardManager;
 import org.jivesoftware.util.JiveGlobals;
 import org.jivesoftware.util.EmailService;
-import org.xmpp.packet.Presence;
-import org.xmpp.packet.JID;
 import org.xmpp.packet.Message;
 import org.xmpp.packet.Packet;

@@ -56,7 +54,9 @@ public class emailOnAway implements Plugin, PacketInterceptor {
        message.setTo(to);
        message.setFrom(from);
        message.setSubject("I'm away");
-        message.setBody("I'm currently away.  Your message has been forwarded to my service email address ("+emailTo+").");
+        if (JiveGlobals.getBooleanProperty( "plugin.emailonaway.showemail", false ) ) { 
+        	message.setBody( "I'm currently away. Your message has been forwarded to my service email address (" + emailTo + ")." ); 
+        	} else { message.setBody( "I'm currently away. Your message has been forwarded to my service email address." ); }
        return message;
    }