Zimbra-Community · rpelletierrefocus · Apr 27, 2020 · Apr 27, 2020 · Apr 30, 2020 · Apr 30, 2020
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+releases
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/README.md b/README.md
@@ -30,8 +30,9 @@ For this you need to set-up the Java server extension copy it from https://githu
         adminpassword=adminPassword
         rocketurl=https://rocket.example.org
         loginurl=https://mail.example.org
+        domaininusername=true
 
-This adminuser and password you should have created when you first installed Rocket. The loginurl is the place where we point users to that have not yet authenticated. This can be your SSO login page or the Zimbra login page. Don't forget `zmmailboxdctl restart`.
+This adminuser and password you should have created when you first installed Rocket. The loginurl is the place where we point users to that have not yet authenticated. This can be your SSO login page or the Zimbra login page. The domaininusername property when set to true will create/logon users with their zimbra email address (replacing @ with a . ) i.e user@example.com will be user.example.com. When set to false, the username account would simply be "user". Don't forget `zmmailboxdctl restart`. 
 
 You must also configure Rocket chat like so:
 ![Zimbra Rocket](https://raw.githubusercontent.com/Zimbra-Community/zimbra-rocket/master/img/zimbra-rocket-iframe.png)
@@ -54,7 +55,7 @@ Edit the /tmp/config_template.xml.tmp file according to your needs. Import the n
       zmzimletctl configure /tmp/config_template.xml.tmp
 
 2. **Logon-only integration**
-Follow the same steps as under `Full integration` except when configuring the Zimlet set `createRocketAccount` to `false`.  The Zimlet assumes you created the account on Rocket chat. So if your Zimbra account is user@example.com a Rocket user account user.example.com should exist.
+Follow the same steps as under `Full integration` except when configuring the Zimlet set `createRocketAccount` to `false`.  The Zimlet assumes you created the account on Rocket chat. So if your Zimbra account is user@example.com a Rocket user account user.example.com should exist, unless you configured domaininusername in config.properties to true. In that, case the zimlet assumes account"user" exists.
 
 3. **Basic integration**
 In this case you may want to configure Rocket to use Zimbra LDAP. See steps below.

diff --git a/extension/build.xml b/extension/build.xml
@@ -0,0 +1,50 @@
+<project name="mytest" default="jar" basedir=".">
+    <description>
+        Build file for the Zimbra Extension.
+    </description>
+
+    <property name="lib"   value="lib/"/>
+    <property name="build" value="build/"/>
+    <property name="src"   value="src/"/>
+    <property name="jar"   value="rocket.jar"/>
+
+    <path id="libraries">
+        <fileset dir="${lib}" >
+            <include name="*.jar"/>
+        </fileset>
+    </path>
+
+    <target name="clean">
+      <delete dir="${build}"/>
+      <delete file="rocket.jar"/>      
+      <mkdir dir="${build}"/>
+    </target>
+
+    <target name="compile"
+            depends="clean">
+        <javac srcdir="${src}"
+               destdir="${build}"
+               includeantruntime="false"
+               debug="true"
+               debuglevel="lines,vars,source"
+               target="13"
+               source="13">
+            <classpath>
+                <path refid="libraries" />
+            </classpath>
+        </javac>
+    </target>
+
+    <target name="jar"
+            depends="compile">
+        <jar jarfile="${jar}"
+             compress="false"
+             basedir="${build}">
+            <manifest>
+                <attribute name="Zimbra-Extension-Class" value="tk.barrydegraaff.rocket.RocketExtension" />
+            </manifest>
+            <fileset dir="${build}" />
+        </jar>
+    </target>
+
+</project>
diff --git a/extension/build/tk/barrydegraaff/rocket/Rocket.class b/extension/build/tk/barrydegraaff/rocket/Rocket.class
diff --git a/extension/build/tk/barrydegraaff/rocket/RocketExtension.class b/extension/build/tk/barrydegraaff/rocket/RocketExtension.class
diff --git a/extension/lib/activation-1.1.1.jar b/extension/lib/activation-1.1.1.jar
diff --git a/extension/lib/ant-1.6.5.jar b/extension/lib/ant-1.6.5.jar
diff --git a/extension/lib/ant-1.7.0-ziputil-patched.jar b/extension/lib/ant-1.7.0-ziputil-patched.jar
diff --git a/extension/lib/ant-contrib-1.0b2.jar b/extension/lib/ant-contrib-1.0b2.jar
diff --git a/extension/lib/ant-tar-patched.jar b/extension/lib/ant-tar-patched.jar
diff --git a/extension/lib/antisamy-1.5.8z.jar b/extension/lib/antisamy-1.5.8z.jar
diff --git a/extension/lib/antlr-3.2.jar b/extension/lib/antlr-3.2.jar
diff --git a/extension/lib/apache-jsieve-core-0.5.jar b/extension/lib/apache-jsieve-core-0.5.jar
diff --git a/extension/lib/apache-jsp-9.4.18.v20190429.jar b/extension/lib/apache-jsp-9.4.18.v20190429.jar
diff --git a/extension/lib/apache-log4j-extras-1.0.jar b/extension/lib/apache-log4j-extras-1.0.jar
diff --git a/extension/lib/asm-3.3.1.jar b/extension/lib/asm-3.3.1.jar
diff --git a/extension/lib/batik-css-1.7.jar b/extension/lib/batik-css-1.7.jar
diff --git a/extension/lib/batik-i18n-1.9.jar b/extension/lib/batik-i18n-1.9.jar
diff --git a/extension/lib/batik-util-1.8.jar b/extension/lib/batik-util-1.8.jar
diff --git a/extension/lib/bcprov-jdk15on-1.55.jar b/extension/lib/bcprov-jdk15on-1.55.jar
diff --git a/extension/lib/commons-cli-1.2.jar b/extension/lib/commons-cli-1.2.jar
diff --git a/extension/lib/commons-codec-1.7.jar b/extension/lib/commons-codec-1.7.jar
diff --git a/extension/lib/commons-collections-3.2.2.jar b/extension/lib/commons-collections-3.2.2.jar
diff --git a/extension/lib/commons-compress-1.10.jar b/extension/lib/commons-compress-1.10.jar
diff --git a/extension/lib/commons-csv-1.2.jar b/extension/lib/commons-csv-1.2.jar
diff --git a/extension/lib/commons-dbcp-1.4.jar b/extension/lib/commons-dbcp-1.4.jar
diff --git a/extension/lib/commons-fileupload-1.2.2.jar b/extension/lib/commons-fileupload-1.2.2.jar
diff --git a/extension/lib/commons-io-1.4.jar b/extension/lib/commons-io-1.4.jar
diff --git a/extension/lib/commons-lang-2.6.jar b/extension/lib/commons-lang-2.6.jar
diff --git a/extension/lib/commons-logging.jar b/extension/lib/commons-logging.jar
diff --git a/extension/lib/commons-net-3.3.jar b/extension/lib/commons-net-3.3.jar
diff --git a/extension/lib/commons-pool-1.6.jar b/extension/lib/commons-pool-1.6.jar
diff --git a/extension/lib/commons-pool2-2.4.2.jar b/extension/lib/commons-pool2-2.4.2.jar
diff --git a/extension/lib/concurrentlinkedhashmap-lru-1.3.1.jar b/extension/lib/concurrentlinkedhashmap-lru-1.3.1.jar
diff --git a/extension/lib/curator-client-2.0.1-incubating.jar b/extension/lib/curator-client-2.0.1-incubating.jar
diff --git a/extension/lib/curator-framework-2.0.1-incubating.jar b/extension/lib/curator-framework-2.0.1-incubating.jar
diff --git a/extension/lib/curator-recipes-2.0.1-incubating.jar b/extension/lib/curator-recipes-2.0.1-incubating.jar
diff --git a/extension/lib/curator-x-discovery-2.0.1-incubating.jar b/extension/lib/curator-x-discovery-2.0.1-incubating.jar
diff --git a/extension/lib/cxf-2.7.18.jar b/extension/lib/cxf-2.7.18.jar
diff --git a/extension/lib/dom4j-1.5.2.jar b/extension/lib/dom4j-1.5.2.jar
diff --git a/extension/lib/ehcache-3.1.2.jar b/extension/lib/ehcache-3.1.2.jar
diff --git a/extension/lib/freemarker-2.3.19.jar b/extension/lib/freemarker-2.3.19.jar
diff --git a/extension/lib/ganymed-ssh2-build210.jar b/extension/lib/ganymed-ssh2-build210.jar
diff --git a/extension/lib/gifencoder-0.9.jar b/extension/lib/gifencoder-0.9.jar
diff --git a/extension/lib/gmbal-api-only-2.2.6.jar b/extension/lib/gmbal-api-only-2.2.6.jar
diff --git a/extension/lib/guava-23.0.jar b/extension/lib/guava-23.0.jar
diff --git a/extension/lib/helix-core-0.6.1-incubating.jar b/extension/lib/helix-core-0.6.1-incubating.jar
diff --git a/extension/lib/httpasyncclient-4.1.4.jar b/extension/lib/httpasyncclient-4.1.4.jar
diff --git a/extension/lib/httpclient-4.5.8.jar b/extension/lib/httpclient-4.5.8.jar
diff --git a/extension/lib/httpcore-4.4.11.jar b/extension/lib/httpcore-4.4.11.jar
diff --git a/extension/lib/httpcore-nio-4.4.11.jar b/extension/lib/httpcore-nio-4.4.11.jar
diff --git a/extension/lib/httpmime-4.3.1.jar b/extension/lib/httpmime-4.3.1.jar
diff --git a/extension/lib/ical4j-0.9.16-patched.jar b/extension/lib/ical4j-0.9.16-patched.jar
diff --git a/extension/lib/icu4j-4.8.1.1.jar b/extension/lib/icu4j-4.8.1.1.jar
diff --git a/extension/lib/istack-commons-runtime-3.0.8.jar b/extension/lib/istack-commons-runtime-3.0.8.jar
diff --git a/extension/lib/jackson-annotations-2.9.2.jar b/extension/lib/jackson-annotations-2.9.2.jar
diff --git a/extension/lib/jackson-core-2.9.2.jar b/extension/lib/jackson-core-2.9.2.jar
diff --git a/extension/lib/jackson-databind-2.9.2.jar b/extension/lib/jackson-databind-2.9.2.jar
diff --git a/extension/lib/jackson-dataformat-smile-2.9.2.jar b/extension/lib/jackson-dataformat-smile-2.9.2.jar
diff --git a/extension/lib/jackson-module-jaxb-annotations-2.8.9.jar b/extension/lib/jackson-module-jaxb-annotations-2.8.9.jar
diff --git a/extension/lib/jamm-0.2.5.jar b/extension/lib/jamm-0.2.5.jar
diff --git a/extension/lib/javax.annotation-api-1.2.jar b/extension/lib/javax.annotation-api-1.2.jar
diff --git a/extension/lib/javax.servlet-api-3.1.0.jar b/extension/lib/javax.servlet-api-3.1.0.jar
diff --git a/extension/lib/javax.ws.rs-api-2.0-m10.jar b/extension/lib/javax.ws.rs-api-2.0-m10.jar
diff --git a/extension/lib/jaxb-api-2.3.1.jar b/extension/lib/jaxb-api-2.3.1.jar
diff --git a/extension/lib/jaxb-impl-2.3.1.jar b/extension/lib/jaxb-impl-2.3.1.jar
diff --git a/extension/lib/jaxen-1.1.3.jar b/extension/lib/jaxen-1.1.3.jar
diff --git a/extension/lib/jaxws-api-2.3.1.jar b/extension/lib/jaxws-api-2.3.1.jar
diff --git a/extension/lib/jaxws-rt-2.2.6.jar b/extension/lib/jaxws-rt-2.2.6.jar
diff --git a/extension/lib/jcharset-2.0.jar b/extension/lib/jcharset-2.0.jar
diff --git a/extension/lib/jcommon-1.0.21.jar b/extension/lib/jcommon-1.0.21.jar
diff --git a/extension/lib/jcs-1.3.jar b/extension/lib/jcs-1.3.jar
diff --git a/extension/lib/jdom-1.1.jar b/extension/lib/jdom-1.1.jar
diff --git a/extension/lib/jedis-2.9.0.jar b/extension/lib/jedis-2.9.0.jar
diff --git a/extension/lib/jersey-client-1.11.jar b/extension/lib/jersey-client-1.11.jar
diff --git a/extension/lib/jersey-core-1.11.jar b/extension/lib/jersey-core-1.11.jar
diff --git a/extension/lib/jersey-json-1.11.jar b/extension/lib/jersey-json-1.11.jar
diff --git a/extension/lib/jersey-multipart-1.11.jar b/extension/lib/jersey-multipart-1.11.jar
diff --git a/extension/lib/jersey-server-1.11.jar b/extension/lib/jersey-server-1.11.jar
diff --git a/extension/lib/jersey-servlet-1.11.jar b/extension/lib/jersey-servlet-1.11.jar
diff --git a/extension/lib/jfreechart-1.0.15.jar b/extension/lib/jfreechart-1.0.15.jar
diff --git a/extension/lib/jline-0.9.93.jar b/extension/lib/jline-0.9.93.jar
diff --git a/extension/lib/jna-3.4.0.jar b/extension/lib/jna-3.4.0.jar
diff --git a/extension/lib/json.jar b/extension/lib/json.jar
diff --git a/extension/lib/jsr181-api-1.0-MR1.jar b/extension/lib/jsr181-api-1.0-MR1.jar
diff --git a/extension/lib/jsr311-api-1.1.1.jar b/extension/lib/jsr311-api-1.1.1.jar
diff --git a/extension/lib/junixsocket-common-2.0.4.jar b/extension/lib/junixsocket-common-2.0.4.jar
diff --git a/extension/lib/junixsocket-demo-2.0.4.jar b/extension/lib/junixsocket-demo-2.0.4.jar
diff --git a/extension/lib/junixsocket-mysql-2.0.4.jar b/extension/lib/junixsocket-mysql-2.0.4.jar
diff --git a/extension/lib/junixsocket-native-common-2.0.4.jar b/extension/lib/junixsocket-native-common-2.0.4.jar
diff --git a/extension/lib/junixsocket-rmi-2.0.4.jar b/extension/lib/junixsocket-rmi-2.0.4.jar
diff --git a/extension/lib/jython-standalone-2.5.2.jar b/extension/lib/jython-standalone-2.5.2.jar
diff --git a/extension/lib/jzlib-1.0.7.jar b/extension/lib/jzlib-1.0.7.jar
diff --git a/extension/lib/libidn-1.24.jar b/extension/lib/libidn-1.24.jar
diff --git a/extension/lib/log4j-1.2.16.jar b/extension/lib/log4j-1.2.16.jar
diff --git a/extension/lib/lucene-analyzers-3.5.0.jar b/extension/lib/lucene-analyzers-3.5.0.jar
diff --git a/extension/lib/lucene-core-3.5.0.jar b/extension/lib/lucene-core-3.5.0.jar
diff --git a/extension/lib/lucene-smartcn-3.5.0.jar b/extension/lib/lucene-smartcn-3.5.0.jar
diff --git a/extension/lib/mail-1.4.7.jar b/extension/lib/mail-1.4.7.jar
diff --git a/extension/lib/mariadb-java-client-2.4.3.jar b/extension/lib/mariadb-java-client-2.4.3.jar
diff --git a/extension/lib/mina-core-2.0.4.jar b/extension/lib/mina-core-2.0.4.jar
diff --git a/extension/lib/native-lib-loader-2.0.2.jar b/extension/lib/native-lib-loader-2.0.2.jar
diff --git a/extension/lib/neethi-3.0.2.jar b/extension/lib/neethi-3.0.2.jar
diff --git a/extension/lib/nekohtml-1.9.13.1z.jar b/extension/lib/nekohtml-1.9.13.1z.jar
diff --git a/extension/lib/oauth-20100527.jar b/extension/lib/oauth-20100527.jar
diff --git a/extension/lib/policy-2.3.jar b/extension/lib/policy-2.3.jar
diff --git a/extension/lib/resolver-20050927.jar b/extension/lib/resolver-20050927.jar
diff --git a/extension/lib/sac-1.3.jar b/extension/lib/sac-1.3.jar
diff --git a/extension/lib/slf4j-api-1.6.4.jar b/extension/lib/slf4j-api-1.6.4.jar
diff --git a/extension/lib/slf4j-log4j12-1.6.4.jar b/extension/lib/slf4j-log4j12-1.6.4.jar
diff --git a/extension/lib/smack-3.1.0.jar b/extension/lib/smack-3.1.0.jar
diff --git a/extension/lib/smackx-3.1.0.jar b/extension/lib/smackx-3.1.0.jar
diff --git a/extension/lib/smackx-debug-3.2.1.jar b/extension/lib/smackx-debug-3.2.1.jar
diff --git a/extension/lib/smackx-jingle-3.2.1.jar b/extension/lib/smackx-jingle-3.2.1.jar
diff --git a/extension/lib/spring-aop-3.0.7.RELEASE.jar b/extension/lib/spring-aop-3.0.7.RELEASE.jar
diff --git a/extension/lib/spring-asm-3.0.7.RELEASE.jar b/extension/lib/spring-asm-3.0.7.RELEASE.jar
diff --git a/extension/lib/spring-beans-3.0.7.RELEASE.jar b/extension/lib/spring-beans-3.0.7.RELEASE.jar
diff --git a/extension/lib/spring-context-3.0.7.RELEASE.jar b/extension/lib/spring-context-3.0.7.RELEASE.jar
diff --git a/extension/lib/spring-core-3.0.7.RELEASE.jar b/extension/lib/spring-core-3.0.7.RELEASE.jar
diff --git a/extension/lib/spring-expression-3.0.7.RELEASE.jar b/extension/lib/spring-expression-3.0.7.RELEASE.jar
diff --git a/extension/lib/spymemcached-2.12.1.jar b/extension/lib/spymemcached-2.12.1.jar
diff --git a/extension/lib/sqlite-jdbc-3.7.15-M1.jar b/extension/lib/sqlite-jdbc-3.7.15-M1.jar
diff --git a/extension/lib/stax-ex-1.7.7.jar b/extension/lib/stax-ex-1.7.7.jar
diff --git a/extension/lib/stax2-api-3.1.1.jar b/extension/lib/stax2-api-3.1.1.jar
diff --git a/extension/lib/streambuffer-2.2.6.jar b/extension/lib/streambuffer-2.2.6.jar
diff --git a/extension/lib/syslog4j-0.9.46.jar b/extension/lib/syslog4j-0.9.46.jar
diff --git a/extension/lib/unboundid-ldapsdk-2.3.5.jar b/extension/lib/unboundid-ldapsdk-2.3.5.jar
diff --git a/extension/lib/woodstox-core-asl-4.2.0.jar b/extension/lib/woodstox-core-asl-4.2.0.jar
diff --git a/extension/lib/wsdl4j-1.6.3.jar b/extension/lib/wsdl4j-1.6.3.jar
diff --git a/extension/lib/xercesImpl-2.9.1-patch-01.jar b/extension/lib/xercesImpl-2.9.1-patch-01.jar
diff --git a/extension/lib/xmlschema-core-2.0.3.jar b/extension/lib/xmlschema-core-2.0.3.jar
diff --git a/extension/lib/yuicompressor-2.4.2-zimbra.jar b/extension/lib/yuicompressor-2.4.2-zimbra.jar
diff --git a/extension/lib/zimbra-charset.jar b/extension/lib/zimbra-charset.jar
diff --git a/extension/lib/zimbra-native.jar b/extension/lib/zimbra-native.jar
diff --git a/extension/lib/zimbraclient.jar b/extension/lib/zimbraclient.jar
diff --git a/extension/lib/zimbracommon.jar b/extension/lib/zimbracommon.jar
diff --git a/extension/lib/zimbrasoap.jar b/extension/lib/zimbrasoap.jar
diff --git a/extension/lib/zimbrastore.jar b/extension/lib/zimbrastore.jar
diff --git a/extension/lib/zkclient-0.1.0.jar b/extension/lib/zkclient-0.1.0.jar
diff --git a/extension/lib/zm-ews-stub-2.0.jar b/extension/lib/zm-ews-stub-2.0.jar
diff --git a/extension/lib/zmzimbratozimbramig.jar b/extension/lib/zmzimbratozimbramig.jar
diff --git a/extension/lib/zookeeper-3.4.5.jar b/extension/lib/zookeeper-3.4.5.jar
diff --git a/extension/makefile b/extension/makefile
@@ -0,0 +1,9 @@
+all: extension
+
+extension:
+	ant jar
+
+clean:
+	rm -f rocket.jar
+
+.PHONY: all extension
diff --git a/extension/src/tk/barrydegraaff/rocket/Rocket.java b/extension/src/tk/barrydegraaff/rocket/Rocket.java
@@ -150,6 +150,7 @@ public String getPath() {
     private String adminPassword;
     private String rocketURL;
     private String loginurl;
+    private String domaininusername;
 
     /**
      * Processes HTTP POST requests.
@@ -224,16 +225,38 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
             switch (paramsMap.get("action")) {
                 case "createUser":
                     String password = newPassword();
-                    if (this.createUser(zimbraAccount.getName(), zimbraAccount.getGivenName() + " " + zimbraAccount.getSn(), password, zimbraAccount.getName().replace("@", "."), zimbraAccount)) {
-                        resp.setHeader("Content-Type", "text/plain");
-                        responseWriter("ok", resp, password);
+                    if (this.domaininusername == "true") {
+                        if (this.createUser(zimbraAccount.getName(), zimbraAccount.getGivenName() + " " + zimbraAccount.getSn(), password, zimbraAccount.getName().replace("@", "."), zimbraAccount)) {
+                            resp.setHeader("Content-Type", "text/plain");
+                            responseWriter("ok", resp, password);
+                        } else {
+                            responseWriter("error", resp, null);
+                        }
                     } else {
-                        responseWriter("error", resp, null);
+                        if (this.createUser(zimbraAccount.getName(), zimbraAccount.getGivenName() + " " + zimbraAccount.getSn(), password, zimbraAccount.getName().substring(0, zimbraAccount.getName().indexOf("@")), zimbraAccount)) {
+                            resp.setHeader("Content-Type", "text/plain");
+                            responseWriter("ok", resp, password);
+                        } else {
+                            responseWriter("error", resp, null);
+                        }
                     }
                     break;
                 case "signOn":
                     String token;
-                    token = this.setUserAuthToken(zimbraAccount.getName().replace("@", "."));
+                    if (this.domaininusername == "true") {
+                        token = this.setUserAuthToken(zimbraAccount.getName().replace("@", "."));
+                    } else {
+                        token = this.setUserAuthToken(zimbraAccount.getName().substring(0, zimbraAccount.getName().indexOf("@")));
+                    }
+                      // Creating a File object that represents the disk file. 
+                         PrintStream o = new PrintStream(new File("rocket.txt")); 
+
+                         // Store current System.out before assigning a new value 
+                         PrintStream console = System.out; 
+
+                         // Assign o to output stream 
+                         System.setOut(o); 
+                         System.out.println(zimbraAccount.getName().substring(0, zimbraAccount.getName().indexOf("@")));
                     if (!"".equals(token)) {
                         resp.setHeader("Content-Type", "application/json");
                         responseWriter("ok", resp, "{\"loginToken\":\"" + token + "\"}");
@@ -305,6 +328,7 @@ public Boolean initializeRocketAPI() {
             this.adminPassword = prop.getProperty("adminpassword");
             this.rocketURL = prop.getProperty("rocketurl");
             this.loginurl = prop.getProperty("loginurl");
+            this.domaininusername = prop.getProperty("domaininusername");
             input.close();
         } catch (Exception ex) {
             ex.printStackTrace();

diff --git a/releases/com_zimbra_rocket.zip b/releases/com_zimbra_rocket.zip
diff --git a/releases/rocket.jar b/releases/rocket.jar
diff --git a/rocket-test/src/tk/barrydegraaff/Main.java b/rocket-test/src/tk/barrydegraaff/Main.java
@@ -18,6 +18,7 @@ public static void main(String[] args) {
         String adminPassword;
         String rocketURL;
         String loginurl;
+        String domaininusername;
 
         StringBuffer response = new StringBuffer();
 
@@ -29,6 +30,8 @@ public static void main(String[] args) {
             adminPassword = prop.getProperty("adminpassword");
             rocketURL = prop.getProperty("rocketurl");
             loginurl = prop.getProperty("loginurl");
+            domaininusername = prop.getProperty("domaininusername");
+            System.out.println(domaininusername);
             input.close();
         } catch (Exception ex) {
             ex.printStackTrace();

diff --git a/zimlet/com_zimbra_rocket/com_zimbra_rocket.js b/zimlet/com_zimbra_rocket/com_zimbra_rocket.js
@@ -10,7 +10,8 @@ ZimbraRocketZimlet.prototype.init = function () {
    try {
       var zimletInstance = appCtxt._zimletMgr.getZimletByName('com_zimbra_rocket').handlerObject;
       zimletInstance.rocketurl = zimletInstance._zimletContext.getConfig("rocketurl");
-      zimletInstance.createRocketAccount = zimletInstance._zimletContext.getConfig("createRocketAccount");      
+      zimletInstance.createRocketAccount = zimletInstance._zimletContext.getConfig("createRocketAccount");
+      zimletInstance.tabLabel = zimletInstance._zimletContext.getConfig("tabLabel");
 
       if(!zimletInstance.userAccountCreateInteger)
       {
@@ -35,7 +36,7 @@ ZimbraRocketZimlet.prototype.setIframe = function()
 {
    try {
    var zimletInstance = appCtxt._zimletMgr.getZimletByName('com_zimbra_rocket').handlerObject;	   
-   zimletInstance.ZimbraRocketTab = zimletInstance.createApp("Rocket.Chat", "", "Rocket.Chat");
+   zimletInstance.ZimbraRocketTab = zimletInstance.createApp(zimletInstance.tabLabel, "", zimletInstance.tabLabel);
    var app = appCtxt.getApp(zimletInstance.ZimbraRocketTab);
    var appPosition = document.getElementById('skin_container_app_new_button').getBoundingClientRect();
    app.setContent('<div style="position: fixed; top:'+appPosition.y+'px; left:0; width:100%; height:92%; border:0px;"><iframe id="ZimbraRocketFrame" style="z-index:2; left:0; width:100%; height:100%; border:0px;" src=\"'+zimletInstance._zimletContext.getConfig("rocketurl")+'\"></div>');   
@@ -53,7 +54,7 @@ function(appName, active) {
    var zimletInstance = appCtxt._zimletMgr.getZimletByName('com_zimbra_rocket').handlerObject;
 	if (active)
    {
-      document.title = 'Zimbra: ' + 'Rocket.Chat';
+      document.title = 'Zimbra: ' + zimletInstance.tabLabel;
       //In the Zimbra tab hide the left menu bar that is displayed by default in Zimbra, also hide the mini calendar
       document.getElementById('z_sash').style.display = "none";   
       //Users that click the tab directly after logging in, will still be served with the calendar, as it is normal

diff --git a/zimlet/com_zimbra_rocket/config_template.xml b/zimlet/com_zimbra_rocket/config_template.xml
@@ -14,6 +14,7 @@ creation set createRocketAccount = true
     <global>
         <property name="rocketurl">https://rocketserverhere.org/</property>
         <property name="createRocketAccount">true</property>
+        <property name="tabLabel">Rocket.Chat</property>
     </global>
 </zimletConfig>