OF-1354 add option to CC to disable start a chat (#841)

* OF-1354 add option to CC to disable start a chat

* OF-1354 add option to CC to disable start a chat

* OF-1354 add option to CC to disable start a chat

* OF-1354 add option to CC to disable start a chat

* OF-1354 add option to CC to disable start a chat

* OF-1354 add option to CC to disable start a chat

* OF-1354 add option to CC to disable start a chat

* OF-1354 add option to CC to disable start a chat

* OF-1354 add option to CC to disable start a chat

* OF-1354 add option to CC to disable start a chat

* OF-1354 add option to CC to disable start a chat

* OF-1354 add option to CC to disable start a chat

* OF-1354 add option to CC to disable start a chat

* OF-1354 add option to CC to disable start a chat

* OF-1354 add option to CC to disable start a chat

* OF-1354 add option to CC to disable start a chat

src/plugins/clientControl/changelog.html

@@ -43,6 +43,12 @@
 <h1>
 Client Control Plugin Changelog
 </h1>
+<p><b>2.1.3</b> -- July 30, 2017</p>
+<ul>
+    <li>[<a href='https://issues.igniterealtime.org/browse/OF-1354'>OF-1354</a>] - Add option to Client Control plugin to disable Start a chat in Spark.</li>
+    <li>This update corresponds with ticket SPARK-1946 and requires Spark version 2.9.0 and above for new functionality.</li>
+</ul>    
+    
 <p><b>2.1.2</b> -- May 8, 2017</p>
 <ul>
     <li>[<a href='http://www.igniterealtime.org/issues/browse/OF-1325'>OF-1325</a>] - Adds 'History Transcripts' and fixes 'History Settings' in Client Control.</li>

src/plugins/clientControl/plugin.xml

@@ -8,8 +8,8 @@
     <name>Client Control</name>
     <description>Controls clients allowed to connect and available features</description>
     <author>Jive Software</author>
-    <version>2.1.2</version>
-    <date>5/08/2017</date>
+    <version>2.1.3</version>
+    <date>7/30/2017</date>
     <minServerVersion>4.0.0</minServerVersion>
 
     <!-- UI extension -->

src/plugins/clientControl/src/i18n/clientcontrol_i18n.properties

@@ -120,6 +120,8 @@ client.features.viewnotes                        = View Notes
 client.features.viewnotes.description            = Allow users access to the "View notes" menu item.
 client.features.viewtasklist                     = View Task List
 client.features.viewtasklist.description         = Allow users access to the "View task list" menu item.
+client.features.startachat                       = Start A Chat
+client.features.startachat.description           = Allow users to start a chat with users not in their roster.
 
 permitted.client.title = Permitted Clients
 permitted.client.description =  Use the form below to restrict client access.

src/plugins/clientControl/src/i18n/clientcontrol_i18n_cs_CZ.properties

@@ -154,6 +154,8 @@ client.features.viewnotes                        = View Notes
 client.features.viewnotes.description            = Umo\u017E\u0148uj\u00ED u\u017Eivatel\u016Fm p\u0159\u00EDstup k "View Notes" polo\u017Eky menu.
 client.features.viewtasklist                     = Zobrazen\u00ED seznamu \u00FAkol\u016F
 client.features.viewtasklist.description         = Umo\u017E\u0148uj\u00ED u\u017Eivatel\u016Fm p\u0159\u00EDstup k "View seznamu \u00FAkol\u016F" polo\u017Eky menu.
+client.features.startachat                       = Za\u010d\u00edt Chat
+client.features.startachat.description           = Povolit u\u017eivatel\u016fm zah\u00e1jit rozhovor s u\u017eivateli, kte\u0159\u00ed nejsou v jejich seznamu.
 
 error.exception = V\u00FDjimka:
 

src/plugins/clientControl/src/i18n/clientcontrol_i18n_es.properties

@@ -166,6 +166,8 @@ client.features.viewnotes                        = Ver notas
 client.features.viewnotes.description            = Permitir a los usuarios el acceso a la opci\u00F3n de men\u00FA "Ver notas".
 client.features.viewtasklist                     = Ver lista de tareas
 client.features.viewtasklist.description         = Permitir a los usuarios el acceso a la opci\u00F3n de men\u00FA "Ver lista de tareas".
+client.features.startachat                       = Comenzar una conversaci\u00f3n
+client.features.startachat.description           = Permitir a los usuarios iniciar una conversaci\u00f3n con usuarios que no est\u00e1n en su lista.
 
 error.exception = Excepci\u00F3n:
 

src/plugins/clientControl/src/i18n/clientcontrol_i18n_fr.properties

@@ -184,6 +184,8 @@ client.features.viewnotes                        = Voir Notes
 client.features.viewnotes.description            = Permettre aux utilisateurs d'acc\u00E9der \u00E0 l'option de menu "Afficher les notes".
 client.features.viewtasklist                     = Afficher la liste des t\u00E2ches
 client.features.viewtasklist.description         = Permettre aux utilisateurs d'acc\u00E9der \u00E0 l'\u00E9l\u00E9ment de menu "Afficher la liste des t\u00E2ches".
+client.features.startachat                       = Commencer une Conversation
+client.features.startachat.description           = Permettre aux utilisateurs de lancer un chat avec les utilisateurs qui ne figurent pas dans leur liste.
 
 dashboard.currentconversations              = Conversations en cours
 dashboard.currentconversations.details      = Voir les d\u00E9tails

src/plugins/clientControl/src/i18n/clientcontrol_i18n_pt_BR.properties

@@ -159,6 +159,8 @@ client.features.viewnotes                        = notas
 client.features.viewnotes.description            = Permitir aos usu\u00E1rios o acesso ao item de menu "notas".
 client.features.viewtasklist                     = Ver lista de tarefas
 client.features.viewtasklist.description         = Permitir aos usu\u00E1rios acesso ao "Ver lista de tarefas" item de menu.
+client.features.startachat                       = Iniciar um Chat
+client.features.startachat.description           = Permitir que os usu\u00e1rios iniciem um bate-papo com os usu\u00e1rios que n\u00e3o est\u00e3o na lista.
 
 ##
 ## Enterprise Resource Bundle

src/plugins/clientControl/src/i18n/clientcontrol_i18n_zh_CN.properties

@@ -190,6 +190,8 @@ client.features.viewnotes                        = \u67E5\u770B\u5907\u6CE8
 client.features.viewnotes.description            = \u5141\u8BB8\u7528\u6237\u8BBF\u95EE\u201C\u67E5\u770B\u7B14\u8BB0\u201D\u83DC\u5355\u9879\u3002
 client.features.viewtasklist                     = \u67E5\u770B\u4EFB\u52A1\u5217\u8868
 client.features.viewtasklist.description         = \u5141\u8BB8\u7528\u6237\u8BBF\u95EE\u201C\u67E5\u770B\u4EFB\u52A1\u5217\u8868\u201D\u83DC\u5355\u9879\u3002
+client.features.startachat                       = \u53D1\u9001\u5373\u65F6\u6D88\u606F
+client.features.startachat.description           = Allow users to start a chat with users not in their roster.
 
 error.exception = \u5F02\u5E38:
 

src/plugins/clientControl/src/java/org/jivesoftware/openfire/plugin/spark/SparkManager.java

@@ -506,6 +506,12 @@ public class SparkManager implements Component {
         if (viewtasklistEnabled) {
         	responseElement.addElement("feature").addAttribute("var", "view-tasks");
         }
+        
+        // Check for START A CHAT feature        
+        boolean startachatEnabled = Boolean.parseBoolean(JiveGlobals.getProperty("startachat.enabled", "true"));
+        if (startachatEnabled) {
+        	responseElement.addElement("feature").addAttribute("var", "start-a-chat");
+        }
 
     }
 

src/plugins/clientControl/src/web/client-features.jsp

@@ -51,6 +51,7 @@
     String updatesEnabledString = JiveGlobals.getProperty("updates.enabled", "true");
     String viewnotesEnabledString = JiveGlobals.getProperty("viewnotes.enabled", "true");
     String viewtasklistEnabledString = JiveGlobals.getProperty("viewtasklist.enabled", "true");
+    String startachatEnabledString = JiveGlobals.getProperty("startachat.enabled", "true");
 
     boolean submit = request.getParameter("submit") != null;
 
@@ -95,6 +96,7 @@
 		updatesEnabledString = request.getParameter("updatesEnabled");
 		viewnotesEnabledString = request.getParameter("viewnotesEnabled");
 		viewtasklistEnabledString = request.getParameter("viewtasklistEnabled");
+        startachatEnabledString = request.getParameter("startachatEnabled");
 
 		JiveGlobals.setProperty("accounts.enabled", accountsEnabledString);
 		JiveGlobals.setProperty("addcontacts.enabled", addcontactsEnabledString);
@@ -124,6 +126,7 @@
 		JiveGlobals.setProperty("updates.enabled", updatesEnabledString);
 		JiveGlobals.setProperty("viewnotes.enabled", viewnotesEnabledString);
 		JiveGlobals.setProperty("viewtasklist.enabled", viewtasklistEnabledString);
+        JiveGlobals.setProperty("startachat.enabled", startachatEnabledString);
     }
     
 	boolean accountsEnabled = Boolean.parseBoolean(accountsEnabledString);
@@ -154,6 +157,7 @@
 	boolean updatesEnabled = Boolean.parseBoolean(updatesEnabledString);
 	boolean viewnotesEnabled = Boolean.parseBoolean(viewnotesEnabledString);
 	boolean viewtasklistEnabled = Boolean.parseBoolean(viewtasklistEnabledString);
+    boolean startachatEnabled = Boolean.parseBoolean(startachatEnabledString);
 		
     // Enable File Transfer in the system.
     ClientControlPlugin plugin = (ClientControlPlugin) XMPPServer.getInstance()
@@ -283,6 +287,17 @@
 	                <input type="radio" name="renamesEnabled" value="false" <%= !renamesEnabled ? "checked" : "" %> />
 	            </td>
 	        </tr>
+            <tr>
+	            <td><b><fmt:message key="client.features.startachat" /></b> - <fmt:message key="client.features.spark.only" /><br/><span class="jive-description">
+	               <fmt:message key="client.features.startachat.description" />
+	           </span></td>
+	            <td width="1%" nowrap>
+	                <input type="radio" name="startachatEnabled" value="true" <%= startachatEnabled ? "checked" : "" %> />
+	            </td>
+	            <td width="1%" nowrap>
+	                <input type="radio" name="startachatEnabled" value="false" <%= !startachatEnabled ? "checked" : "" %> />
+	            </td>
+	        </tr>
 	        <tr>
 	            <td><b><fmt:message key="client.features.transfer" /></b> - <fmt:message key="client.features.otherclients" /><br/><span class="jive-description">
 	               <fmt:message key="client.features.transfer.description" />
@@ -520,4 +535,4 @@
     <input type="submit" name="submit" value="<fmt:message key="client.features.save.settings" />" />
 </form>
 </body>
-</html>
\ No newline at end of file
+</html>