Skip to content

O
Openfire
Commit ede1e7d0 authored by Guus der Kinderen's avatar Guus der Kinderen Committed by daryl herzmann
Browse files
Options

Updates for the inVerse plugin (#859) 

* OF-1370: inVerse plugin: hide registration tab.

When a user cannot register (if the domain is locked, and IBR is disabled), registration options should not be shown.

* OF-1371: Upgrade inVerse to 3.2.1

This commit replaces the converse.js 3.1.0 release with version 3.2.1. Additionally, the plugin now contains a copy of jquery (where previously, a link to a CDN was used).
parent f06ab4b3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 72167 additions and 231 deletions
src/plugins/inverse/changelog.html
View file @ ede1e7d0
...@@ -43,6 +43,12 @@ ...@@ -43,6 +43,12 @@
inVerse Plugin Changelog inVerse Plugin Changelog
</h1> </h1>
<p><b>3.2.1 Release 1</b> -- September 4th, 2017</p>
<ul>
<li><a href="https://issues.igniterealtime.org/browse/OF-1370">OF-1370: hide registration tab when appropriate.</a></li>
<li><a href="https://issues.igniterealtime.org/browse/OF-1371">OF-1371: upgrade to converse.js 3.2.1.</a></li>
</ul>
<p><b>3.1.0 Release 1</b> -- July 10th, 2017</p> <p><b>3.1.0 Release 1</b> -- July 10th, 2017</p>
<ul> <ul>
<li><a href="https://issues.igniterealtime.org/browse/OF-1359">OF-1359: Elevate webclients to top level menu in openfire admin UI</a></li> <li><a href="https://issues.igniterealtime.org/browse/OF-1359">OF-1359: Elevate webclients to top level menu in openfire admin UI</a></li>
......
src/plugins/inverse/classes/index.html
View file @ ede1e7d0
...@@ -6,9 +6,7 @@ ...@@ -6,9 +6,7 @@
<title>inVerse</title> <title>inVerse</title>
<link rel="shortcut icon" type="image/ico" href="inverse/css/images/favicon.ico"/> <link rel="shortcut icon" type="image/ico" href="inverse/css/images/favicon.ico"/>
<link type="text/css" rel="stylesheet" media="screen" href="inverse/css/inverse.min.css" /> <link type="text/css" rel="stylesheet" media="screen" href="inverse/css/inverse.min.css" />
<![if gte IE 9]>
<script src="inverse/dist/inverse.min.js"></script> <script src="inverse/dist/inverse.min.js"></script>
<![endif]>
</head> </head>
<body> <body>
<div class="content"> <div class="content">
...@@ -16,7 +14,7 @@ ...@@ -16,7 +14,7 @@
<h1 class="brand-heading"><i class="icon-conversejs"></i> inVerse</h1> <h1 class="brand-heading"><i class="icon-conversejs"></i> inVerse</h1>
</div> </div>
</div> </div>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script> <script src="jquery/dist/jquery.min.js"></script>
<script> <script>
$( document ).ready( function() $( document ).ready( function()
{ {
......
src/plugins/inverse/classes/inverse/css/inverse.min.css
View file @ ede1e7d0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/plugins/inverse/classes/jquery/dist/jquery.min.js 0 → 100644
View file @ ede1e7d0
This diff is collapsed.
src/plugins/inverse/plugin.xml
View file @ ede1e7d0
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<name>inVerse</name> <name>inVerse</name>
<description>Adds the (third-party) inVerse web client to Openfire.</description> <description>Adds the (third-party) inVerse web client to Openfire.</description>
<author>Guus der Kinderen</author> <author>Guus der Kinderen</author>
<version>3.1.0 Release 1</version> <version>3.2.1 Release 1</version>
<date>07/10/2017</date> <date>09/04/2017</date>
<minServerVersion>4.1.5</minServerVersion> <minServerVersion>4.1.5</minServerVersion>
<adminconsole> <adminconsole>
<tab id="tab-webclients" name="${admin.sidebar.webclients.name}" description="${admin.sidebar.webclients.description}" url="inverse-config.jsp"> <tab id="tab-webclients" name="${admin.sidebar.webclients.name}" description="${admin.sidebar.webclients.description}" url="inverse-config.jsp">
......
src/plugins/inverse/pom.xml
View file @ ede1e7d0
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<groupId>org.igniterealtime.openfire.plugins</groupId> <groupId>org.igniterealtime.openfire.plugins</groupId>
<artifactId>inverse</artifactId> <artifactId>inverse</artifactId>
<name>Inverse Webchat Plugin</name> <name>Inverse Webchat Plugin</name>
<version>3.1.0-release-1</version> <version>3.2.1-release-1</version>
<build> <build>
<sourceDirectory>src/java</sourceDirectory> <sourceDirectory>src/java</sourceDirectory>
......
src/plugins/inverse/src/java/org/igniterealtime/openfire/plugin/inverse/ConfigServlet.java
View file @ ede1e7d0
...@@ -46,6 +46,7 @@ public class ConfigServlet extends HttpServlet ...@@ -46,6 +46,7 @@ public class ConfigServlet extends HttpServlet
{ {
Log.trace( "Processing doGet()" ); Log.trace( "Processing doGet()" );
final boolean inbandRegEnabled = XMPPServer.getInstance().getIQRegisterHandler().isInbandRegEnabled();
final String defaultDomain = JiveGlobals.getProperty( "inverse.config.default_domain", XMPPServer.getInstance().getServerInfo().getXMPPDomain() ); final String defaultDomain = JiveGlobals.getProperty( "inverse.config.default_domain", XMPPServer.getInstance().getServerInfo().getXMPPDomain() );
final boolean lockedDomain = JiveGlobals.getBooleanProperty( "inverse.config.locked_domain", false ); final boolean lockedDomain = JiveGlobals.getBooleanProperty( "inverse.config.locked_domain", false );
final String endpoint = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + "/http-bind/"; final String endpoint = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + "/http-bind/";
...@@ -60,10 +61,18 @@ public class ConfigServlet extends HttpServlet ...@@ -60,10 +61,18 @@ public class ConfigServlet extends HttpServlet
config.put( "i18n", language.getCode() ); config.put( "i18n", language.getCode() );
config.put( lockedDomain ? "locked_domain" : "default_domain", defaultDomain ); config.put( lockedDomain ? "locked_domain" : "default_domain", defaultDomain );
if ( XMPPServer.getInstance().getIQRegisterHandler().isInbandRegEnabled() ) if ( inbandRegEnabled )
{ {
config.put( "registration_domain", defaultDomain ); config.put( "registration_domain", defaultDomain );
} }
// When the domain that inVerse is locked to does not support IBB, there is no point in showing the
// 'registration' taballowing registration. Disallowing registration explicitly will suppress the tab.
if ( !inbandRegEnabled && lockedDomain )
{
config.put( "allow_registration", false );
}
config.put( "domain_placeholder", defaultDomain ); config.put( "domain_placeholder", defaultDomain );
config.put( "bosh_service_url", endpoint ); config.put( "bosh_service_url", endpoint );
config.put( "debug", debug ); config.put( "debug", debug );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023