Skip to content

O
Openfire
Commit c278b63c authored by guus's avatar guus
Browse files
Options

* Updating 'registration' plugin to make use of SLF4J instead of custom logging (OF-53). 

* Replaced StringPrep with LibIDN (OF-78).

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@11445 b35dd754-fafc-0310-a699-88a17e54d16e
parent 3aefa27a
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 22 deletions
src/plugins/registration/changelog.html
View file @ c278b63c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<title>Search Plugin Changelog</title> <title>Registration Plugin Changelog</title>
<style type="text/css"> <style type="text/css">
BODY { BODY {
font-size : 100%; font-size : 100%;
...@@ -44,6 +44,13 @@ ...@@ -44,6 +44,13 @@
Registration Plugin Changelog Registration Plugin Changelog
</h1> </h1>
<p><b>1.5.0</b> -- December 2, 2009</p>
<ul>
<li>Now requires Openfire 3.6.5.</li>
<li>[<a href='http://www.igniterealtime.org/issues/browse/OF-53'>OF-53</a>] - Replace custom logging implementation with a third party library.</li>
<li>[<a href='http://www.igniterealtime.org/issues/browse/OF-78'>OF-78</a>] - Replaced custom Stringprep with LibIDN.</li>
</ul>
<p><b>1.4.1</b> -- November 2, 2007</p> <p><b>1.4.1</b> -- November 2, 2007</p>
<ul> <ul>
<li>JIDs to alert of new registrations are now validated.</li> <li>JIDs to alert of new registrations are now validated.</li>
......
src/plugins/registration/plugin.xml
View file @ c278b63c
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
<name>Registration</name> <name>Registration</name>
<description>Performs various actions whenever a new user account is created.</description> <description>Performs various actions whenever a new user account is created.</description>
<author>Ryan Graham</author> <author>Ryan Graham</author>
<version>1.4.2</version> <version>1.5.0</version>
<date>11/2/2007</date> <date>12/2/2009</date>
<minServerVersion>3.5.0</minServerVersion> <minServerVersion>3.6.5</minServerVersion>
<adminconsole> <adminconsole>
<tab id="tab-users"> <tab id="tab-users">
......
src/plugins/registration/src/java/org/jivesoftware/openfire/plugin/RegistrationPlugin.java
View file @ c278b63c
...@@ -16,6 +16,16 @@ ...@@ -16,6 +16,16 @@
package org.jivesoftware.openfire.plugin; package org.jivesoftware.openfire.plugin;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.jivesoftware.admin.AuthCheckFilter;
import org.jivesoftware.openfire.MessageRouter; import org.jivesoftware.openfire.MessageRouter;
import org.jivesoftware.openfire.XMPPServer; import org.jivesoftware.openfire.XMPPServer;
import org.jivesoftware.openfire.container.Plugin; import org.jivesoftware.openfire.container.Plugin;
...@@ -26,28 +36,22 @@ import org.jivesoftware.openfire.group.Group; ...@@ -26,28 +36,22 @@ import org.jivesoftware.openfire.group.Group;
import org.jivesoftware.openfire.group.GroupManager; import org.jivesoftware.openfire.group.GroupManager;
import org.jivesoftware.openfire.group.GroupNotFoundException; import org.jivesoftware.openfire.group.GroupNotFoundException;
import org.jivesoftware.openfire.user.User; import org.jivesoftware.openfire.user.User;
import org.jivesoftware.admin.AuthCheckFilter;
import org.jivesoftware.util.EmailService; import org.jivesoftware.util.EmailService;
import org.jivesoftware.util.JiveGlobals; import org.jivesoftware.util.JiveGlobals;
import org.jivesoftware.util.Log; import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xmpp.packet.JID; import org.xmpp.packet.JID;
import org.xmpp.packet.Message; import org.xmpp.packet.Message;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
/** /**
* Registration plugin. * Registration plugin.
* *
* @author Ryan Graham. * @author Ryan Graham.
*/ */
public class RegistrationPlugin implements Plugin { public class RegistrationPlugin implements Plugin {
private static final Logger Log = LoggerFactory.getLogger(RegistrationPlugin.class);
private static final String URL = "registration/sign-up.jsp"; private static final String URL = "registration/sign-up.jsp";
/** /**
...@@ -267,7 +271,7 @@ public class RegistrationPlugin implements Plugin { ...@@ -267,7 +271,7 @@ public class RegistrationPlugin implements Plugin {
} }
private class RegistrationUserEventListener implements UserEventListener { private class RegistrationUserEventListener implements UserEventListener {
public void userCreated(User user, Map params) { public void userCreated(User user, Map<String, Object> params) {
if (imNotificationEnabled()) { if (imNotificationEnabled()) {
sendIMNotificatonMessage(user); sendIMNotificatonMessage(user);
} }
...@@ -285,10 +289,10 @@ public class RegistrationPlugin implements Plugin { ...@@ -285,10 +289,10 @@ public class RegistrationPlugin implements Plugin {
} }
} }
public void userDeleting(User user, Map params) { public void userDeleting(User user, Map<String, Object> params) {
} }
public void userModified(User user, Map params) { public void userModified(User user, Map<String, Object> params) {
} }
private void sendIMNotificatonMessage(User user) { private void sendIMNotificatonMessage(User user) {
...@@ -311,7 +315,7 @@ public class RegistrationPlugin implements Plugin { ...@@ -311,7 +315,7 @@ public class RegistrationPlugin implements Plugin {
subject, body, null); subject, body, null);
} }
catch (Exception e) { catch (Exception e) {
Log.error(e); Log.error(e.getMessage(), e);
} }
} }
} }
...@@ -339,7 +343,7 @@ public class RegistrationPlugin implements Plugin { ...@@ -339,7 +343,7 @@ public class RegistrationPlugin implements Plugin {
group.getMembers().add(XMPPServer.getInstance().createJID(user.getUsername(), null)); group.getMembers().add(XMPPServer.getInstance().createJID(user.getUsername(), null));
} }
catch (GroupNotFoundException e) { catch (GroupNotFoundException e) {
Log.error(e); Log.error(e.getMessage(), e);
} }
} }
} }
......
src/plugins/registration/src/web/sign-up.jsp
View file @ c278b63c
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
<%@ page import="org.jivesoftware.openfire.user.*, <%@ page import="org.jivesoftware.openfire.user.*,
org.jivesoftware.openfire.plugin.RegistrationPlugin, org.jivesoftware.openfire.plugin.RegistrationPlugin,
org.jivesoftware.util.*, org.jivesoftware.util.*,
org.jivesoftware.stringprep.Stringprep, gnu.inet.encoding.Stringprep,
org.jivesoftware.stringprep.StringprepException, gnu.inet.encoding.StringprepException,
org.xmpp.packet.JID" org.xmpp.packet.JID"
%> %>
......
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