diff --git a/README.md b/README.md
index 0c8731d..7532795 100644
--- a/README.md
+++ b/README.md
@@ -93,6 +93,7 @@ Setting up Zimbra
adminpassword=adminPassword
rocketurl=https://rocket.example.org
loginurl=https://zimbra.example.org
+ enableWelcomeEmail=true
- The `adminuser` and `adminpassword` should have been created
when you first installed Rocket Chat.
diff --git a/extension/.idea/workspace.xml b/extension/.idea/workspace.xml
index 234a868..a34cd24 100644
--- a/extension/.idea/workspace.xml
+++ b/extension/.idea/workspace.xml
@@ -121,38 +121,38 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -167,9 +167,54 @@
file://$PROJECT_DIR$/src/tk/barrydegraaff/rocket/Rocket.java
- 287
+ 288
+
+ file://$PROJECT_DIR$/src/tk/barrydegraaff/rocket/Rocket.java
+ 375
+
+
+
+ file://$PROJECT_DIR$/src/tk/barrydegraaff/rocket/Rocket.java
+ 555
+
+
+
+ file://$PROJECT_DIR$/src/tk/barrydegraaff/rocket/Rocket.java
+ 556
+
+
+
+ file://$PROJECT_DIR$/src/tk/barrydegraaff/rocket/Rocket.java
+ 557
+
+
+
+ file://$PROJECT_DIR$/src/tk/barrydegraaff/rocket/Rocket.java
+ 554
+
+
+
+ file://$PROJECT_DIR$/src/tk/barrydegraaff/rocket/Rocket.java
+ 571
+
+
+
+ file://$PROJECT_DIR$/src/tk/barrydegraaff/rocket/Rocket.java
+ 573
+
+
+
+ file://$PROJECT_DIR$/src/tk/barrydegraaff/rocket/Rocket.java
+ 574
+
+
+
+ file://$PROJECT_DIR$/src/tk/barrydegraaff/rocket/Rocket.java
+ 572
+
+
diff --git a/extension/build/tk/barrydegraaff/rocket/Rocket.class b/extension/build/tk/barrydegraaff/rocket/Rocket.class
index 6145319..32f4a64 100644
Binary files a/extension/build/tk/barrydegraaff/rocket/Rocket.class and b/extension/build/tk/barrydegraaff/rocket/Rocket.class differ
diff --git a/extension/rocket.jar b/extension/rocket.jar
index 0174dcf..09bed24 100644
Binary files a/extension/rocket.jar and b/extension/rocket.jar differ
diff --git a/extension/src/tk/barrydegraaff/rocket/Rocket.java b/extension/src/tk/barrydegraaff/rocket/Rocket.java
index 92f8aa6..fa94c51 100644
--- a/extension/src/tk/barrydegraaff/rocket/Rocket.java
+++ b/extension/src/tk/barrydegraaff/rocket/Rocket.java
@@ -159,6 +159,7 @@ public String getPath() {
private String rocketURL;
private String loginurl;
private Boolean isMobile;
+ private String enableWelcomeEmail;
/**
* Processes HTTP POST requests.
@@ -372,6 +373,7 @@ public Boolean initializeRocketAPI() {
this.adminPassword = prop.getProperty("adminpassword");
this.rocketURL = prop.getProperty("rocketurl");
this.loginurl = prop.getProperty("loginurl");
+ this.enableWelcomeEmail = prop.getProperty("enableWelcomeEmail"); //may be null
input.close();
} catch (Exception ex) {
ex.printStackTrace();
@@ -551,20 +553,21 @@ public Boolean createUser(Account account) {
private void sendConfirmation(Account account, String username, String password) {
try {
- MimeMessage mm = new Mime.FixedMimeMessage(JMSession.getSmtpSession(account));
+ if (!"false".equals(this.enableWelcomeEmail)) {
+ MimeMessage mm = new Mime.FixedMimeMessage(JMSession.getSmtpSession(account));
+ String to = account.getName();
- String to = account.getName();
+ mm.setRecipient(javax.mail.Message.RecipientType.TO, new JavaMailInternetAddress(to));
+ mm.setContent("Your Rocket.Chat account has been created!
You must log-on to Rocket.Chat using your Zimbra credentials. For changes to crucial settings inside RocketChat you may need these additional credentials:
Username: " + username + " Password: " + password, MimeConstants.CT_TEXT_HTML);
+ mm.setSubject("Welcome to Rocket Chat");
+ mm.saveChanges();
- mm.setRecipient(javax.mail.Message.RecipientType.TO, new JavaMailInternetAddress(to));
- mm.setContent("Your Rocket.Chat account has been created!
You must log-on to Rocket.Chat using your Zimbra credentials. For changes to crucial settings inside RocketChat you may need these additional credentials: