[JM-1410] Inconsistent error messages in new user creation from OF Admin...

[JM-1410] Inconsistent error messages in new user creation from OF Admin Console when CS is connected. To be reviewed. git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@10638 b35dd754-fafc-0310-a699-88a17e54d16e

[JM-1410] Inconsistent error messages in new user creation from OF Admin...
[JM-1410] Inconsistent error messages in new user creation from OF Admin Console when CS is connected. To be reviewed. git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@10638 b35dd754-fafc-0310-a699-88a17e54d16e
f3850767 · Gabriel Guardincerri · gguardin · 36f61d00 · f3850767 · f3850767
Commit f3850767 authored Jul 03, 2008 by Gabriel Guardincerri Committed by gguardin Jul 03, 2008
Show whitespace changes
Inline Side-by-side

Showing with 22 additions and 21 deletions

user-create.jsp src/web/user-create.jsp +2 -3

user-edit-form.jsp src/web/user-edit-form.jsp +20 -18

No files found.
--- a/src/web/user-create.jsp
+++ b/src/web/user-create.jsp
@@ -64,8 +64,7 @@
        // Trim the password. This means we don't accept spaces as passwords. We don't
        // trim the passwordConfirm as well since not trimming will ensure the user doesn't
        // think space is an ok password character.
-        password = password.trim();
+        if (password == null || password.trim().equals("")) {
-        if (password == null || password.equals("")) {
            errors.put("password","");
        }
        if (passwordConfirm == null) {
@@ -76,7 +75,7 @@
        }
        // If provider requires email, validate
        if (UserManager.getUserProvider().isEmailRequired()) {
-            if (StringUtils.isValidEmailAddress(email)) {
+            if (!StringUtils.isValidEmailAddress(email)) {
                errors.put("email","");
            }
        }

--- a/src/web/user-edit-form.jsp
+++ b/src/web/user-edit-form.jsp
@@ -47,7 +47,7 @@
    if (save) {
        // If provider requires email, validate
        if (UserManager.getUserProvider().isEmailRequired()) {
-            if (StringUtils.isValidEmailAddress(email)) {
+            if (!StringUtils.isValidEmailAddress(email)) {
                errors.put("email","");
            }
        }
@@ -58,6 +58,7 @@
            }
        }
+        if (errors.size() == 0) {
            user.setEmail(email);
            user.setName(name);
@@ -80,6 +81,7 @@
            response.sendRedirect("user-properties.jsp?editsuccess=true&username=" + URLEncoder.encode(username, "UTF-8"));
            return;
        }
+    }
 %>
 <html>