* Fixed issue where the username was not being escaped properly on the web sign-up page.

* Added internationalization (i18n) support.
* Updated UI to match later versions of Wildfire.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@7495 b35dd754-fafc-0310-a699-88a17e54d16e

src/plugins/registration/changelog.html

@@ -44,6 +44,13 @@
 Registration Plugin Changelog
 </h1>
 
+<p><b>1.3.2</b> -- March 12, 2007</p>
+<ul>
+    <li>Fixed issue where the username was not being escaped properly on the web sign-up page.
+    <li>Added internationalization (i18n) support.</li>
+    <li>Updated UI to match later versions of Wildfire.</li>
+</ul>
+
 <p><b>1.3.1</b> -- October 06, 2006</p>
 <ul>
     <li>Updated to use compression offered by Wildfire 3.1</li>

src/plugins/registration/src/i18n/registration_i18n.properties

+login.title=Admin Console
+
+registration.props.form.title=User Registration
+registration.props.form.details=Use the form below to edit user registration settings.
+registration.props.form.registration_settings=Registration Settings
+registration.props.form.enable_features=Enable registration features using the checkboxes below.
+registration.props.form.save_success=Settings saved successfully.
+registration.props.form.invalid_group=Please enter and save a valid group name in the Default Group section at the bottom of this page before enabling automatic group adding.
+registration.props.form.enable_im_notification=Enable instant message registration notification.
+registration.props.form.enable_email_notification=Enable email registration notification.
+registration.props.form.enable_welcome_msg=Enable welcome message.
+registration.props.form.enable_add_user_to_group=Enable automatically adding of new users to a group.
+registration.props.form.enable_web_registration=Enable users to register via a web page at
+registration.props.form.save_settings=Save Settings
+registration.props.form.registration_contacts=Registration Notification Contacts
+registration.props.form.registration_contacts_details=Add or remove contacts to be alerted when a new user registers.
+registration.props.form.registration_contact_removed=Contact successfully removed.
+registration.props.form.registration_contact_added=Contact successfully added.
+registration.props.form.registration_contact_missing=Contact missing.
+registration.props.form.registration_contact_not_found=Contact not found.
+registration.props.form.registration_invalid_email=Invalid email address.
+registration.props.form.registration_add_im=Add IM Contact
+registration.props.form.registration_add=Add
+registration.props.form.registration_remove=Remove
+registration.props.form.registration_im_contact=IM Contact
+registration.props.form.registration_no_contact=No contact specified, use the form above to add one.
+registration.props.form.registration_add_email=Add Email Contact
+registration.props.form.registration_email_contact=Email Contact
+registration.props.form.welcome_message=Welcome Message
+registration.props.form.welcome_message_details=Enter the welcome message that will be sent to new users when they register.
+registration.props.form.welcome_message_saved=Message saved successfully.
+registration.props.form.welcome_message_missing=Please enter a welcome message.
+registration.props.form.welcome_message_save=Save Messsage
+registration.props.form.default_group=Default Group
+registration.props.form.default_group_details=Enter the name of the group that all new users will be automatically added to.
+registration.props.form.default_group_saved=Group saved successfully.
+registration.props.form.default_group_invalid=Group not found or is invalid.
+registration.props.form.default_group_save=Save Group
+registration.props.form.sign_up=Sign-Up Page Header Text
+registration.props.form.sign_up_details=Enter the text that will be displayed at the top of the sign-up web page.
+registration.props.form.sign_up_saved=Header saved successfully.
+registration.props.form.sign_up_missing=Please enter a header.
+registration.props.form.sign_up_save=Save Header
+
+registration.sign.up.title=Jive Wildfire Web Registration
+registration.sign.up.unavailable=This service is currently unavailable.
+registration.sign.up.instructions=Use the form below to create a new user account
+registration.sign.up.error_creating_account=Error creating the user account. Please contact the administrator.
+registration.sign.up.invalid_username=Invalid username.
+registration.sign.up.create.user_exist=Username already exists - please choose a different one.
+registration.sign.up.invalid_name=Invalid name.
+registration.sign.up.invalid_email=Invalid email.
+registration.sign.up.invalid_password=Invalid password.
+registration.sign.up.invalid_match_password=Passwords don't match.
+registration.sign.up.invalid_password_confirm=Invalid password confirmation.
+registration.sign.up.success=New account successfully created.
+registration.sign.up.create_account=Create Account
+registration.sign.up.username=Username
+registration.sign.up.name=Name
+registration.sign.up.email=Email
+registration.sign.up.password=Password
+registration.sign.up.confirm_password=Confirm Password
+registration.sign.up.required_fields=Required Fields
\ No newline at end of file

src/plugins/registration/src/web/sign-up.jsp

@@ -9,7 +9,8 @@
                  org.jivesoftware.wildfire.plugin.RegistrationPlugin,
                  org.jivesoftware.util.*,
                  org.jivesoftware.stringprep.Stringprep,
-                 org.jivesoftware.stringprep.StringprepException"
+                 org.jivesoftware.stringprep.StringprepException,
+                 org.xmpp.packet.JID"
 %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
@@ -17,7 +18,7 @@
 
 <html>
 <head>
-    <title>Jive Wildfire Web Registration</title>
+    <title><fmt:message key="registration.sign.up.title" /></title>
     <link rel="stylesheet" type="text/css" href="/style/global.css">
     <style type="text/css">
         .drop-shadow {
@@ -50,6 +51,7 @@
         else {
             try {
                 username = username.trim().toLowerCase();
+                username = JID.escapeNode(username);
                 username = Stringprep.nodeprep(username);
             }
             catch (StringprepException se) {
@@ -101,11 +103,11 @@
 
 <% if (!plugin.webEnabled()) { %>
 
-This service is currently unavailable.
+<fmt:message key="registration.sign.up.unavailable" />
 
 <% } else { %>
 
-<p>Use the form below to create a new user account</p>
+<p><fmt:message key="registration.sign.up.instructions" /></p>
 
 <c:set var="submit" value="${param.create}"/>
 <c:set var="errors" value="${errors}"/>
@@ -120,21 +122,21 @@ This service is currently unavailable.
             <td class="jive-icon-label">
 
             <% if (errors.get("general") != null) { %>
-                <fmt:message key="user.create.error_creating_account" />
+                <fmt:message key="registration.sign.up.error_creating_account" />
             <% } else if (errors.get("username") != null) { %>
-                <fmt:message key="user.create.invalid_username" />
+                <fmt:message key="registration.sign.up.invalid_username" />
             <% } else if (errors.get("usernameAlreadyExists") != null) { %>
-                <fmt:message key="user.create.user_exist" />
+                <fmt:message key="registration.sign.up.user_exist" />
             <% } else if (errors.get("name") != null) { %>
-                <fmt:message key="user.create.invalid_name" />
+                <fmt:message key="registration.sign.up.invalid_name" />
             <% } else if (errors.get("email") != null) { %>
-                <fmt:message key="user.create.invalid_email" />
+                <fmt:message key="registration.sign.up.invalid_email" />
             <% } else if (errors.get("password") != null) { %>
-                <fmt:message key="user.create.invalid_password" />
+                <fmt:message key="registration.sign.up.invalid_password" />
             <% } else if (errors.get("passwordMatch") != null) { %>
-                <fmt:message key="user.create.invalid_match_password" />
+                <fmt:message key="registration.sign.up.invalid_match_password" />
             <% } else if (errors.get("passwordConfirm") != null) { %>
-                <fmt:message key="user.create.invalid_password_confirm" />
+                <fmt:message key="registration.sign.up.invalid_password_confirm" />
             <% } %>
             </td>
         </tr>
@@ -150,7 +152,7 @@ This service is currently unavailable.
     <tbody>
         <tr>
             <td class="jive-icon"><img src="images/success-16x16.gif" width="16" height="16" border="0"></td>
-            <td class="jive-icon-label">New account successfully created.</td>
+            <td class="jive-icon-label"><fmt:message key="registration.sign.up.success" /></td>
         </tr>
     </tbody>
     </table>
@@ -160,13 +162,13 @@ This service is currently unavailable.
 
 <form name="f" action="sign-up.jsp" method="get">
 
-<fieldset>
-    <legend>Create Account</legend>
+<div class="jive-contentBoxHeader"><fmt:message key="registration.sign.up.create_account" /></div>
+<div class="jive-contentBox">
     <div>
     <table cellpadding="3" cellspacing="0" border="0" width="100%">
     <tbody>
     <tr>
-        <td width="1%" nowrap><label for="usernametf">Username:</label> *</td>
+        <td width="1%" nowrap><label for="usernametf"><fmt:message key="registration.sign.up.username" />:</label> *</td>
         <td width="99%">
             <input type="text" name="username" size="30" maxlength="75" value="<%= ((username!=null) ? username : "") %>"
              id="usernametf" autocomplete="off">
@@ -174,7 +176,7 @@ This service is currently unavailable.
     </tr>
     <tr>
         <td width="1%" nowrap>
-            <label for="nametf">Name:</label>
+            <label for="nametf"><fmt:message key="registration.sign.up.name" />:</label>
         </td>
         <td width="99%">
             <input type="text" name="name" size="30" maxlength="75" value="<%= ((name!=null) ? name : "") %>"
@@ -183,7 +185,7 @@ This service is currently unavailable.
     </tr>
     <tr>
         <td width="1%" nowrap>
-            <label for="emailtf">Email:</label></td>
+            <label for="emailtf"><fmt:message key="registration.sign.up.email" />:</label></td>
         <td width="99%">
             <input type="text" name="email" size="30" maxlength="75" value="<%= ((email!=null) ? email : "") %>"
              id="emailtf">
@@ -191,7 +193,7 @@ This service is currently unavailable.
     </tr>
     <tr>
         <td nowrap>
-            <label for="passtf">Password:</label> *
+            <label for="passtf"><fmt:message key="registration.sign.up.password" />:</label> *
         </td>
         <td width="99%">
             <input type="password" name="password" value="" size="20" maxlength="75"
@@ -200,7 +202,7 @@ This service is currently unavailable.
     </tr>
     <tr>
         <td width="1%" nowrap>
-            <label for="confpasstf">Confirm Password:</label> *
+            <label for="confpasstf"><fmt:message key="registration.sign.up.confirm_password" />:</label> *
         </td>
         <td width="99%">
             <input type="password" name="passwordConfirm" value="" size="20" maxlength="75"
@@ -211,15 +213,12 @@ This service is currently unavailable.
     </table>
     <br>
     <span class="jive-description">
-    * Required Fields
+    * <fmt:message key="registration.sign.up.required_fields" />
     </span>
     </div>
-</fieldset>
-
-<br><br>
-
-<input type="submit" name="create" value="Create Account">
+</div>
 
+<input type="submit" name="create" value="<fmt:message key="registration.sign.up.create_account" />">
 </form>
 
 <script language="JavaScript" type="text/javascript">