Project

General

Profile

« Previous | Next » 

Revision 51695

Change username regulars expression - Allow usernames that start with character or digit, Change error messages

View differences:

validation.js
1 1
function validateForm() {
2 2

  
3
    var username = $("#username").val();
4 3
    var email = $("#email").val();
5 4
    var email_conf = $("#email_conf").val();
6 5
    var password = $("#password").val();
7 6
    var password_conf = $("#password_conf").val();
8 7

  
9
    var isValidUsername = validateUsername(username);
10 8
    var isValidEmail = validateEmail(email);
11 9
    var isValidPassword = validatePassword(password);
12 10
    var hasError = false;
......
61 59
        }
62 60
    }
63 61

  
64
    // If username is filled
65
    if (isUsernameFilled) {
66
        // Check if username is valid
67
        if (!isValidUsername) {
68
            $("#username").addClass('uk-input aai-form-danger');
69
            $(".msg_username_allowed_characters").show();
70
            hasError = true;
71
        } else {
72
            $(".msg_username_allowed_characters").hide();
73
            $("#username").removeClass('aai-form-danger');
74
        }
75
    }
76

  
77 62
    if($("#verification_code").val() != undefined) {
78 63
        if($.trim($("#verification_code").val()).length <= 0) {
79 64
            $("#verification_code").addClass('uk-input aai-form-danger');
......
173 158
    return !hasError;
174 159
}
175 160

  
176
function validateUsername(username) {
177
    var re = /^[a-zA-Z0-9._-]{4,150}$/;
178
    return re.test(username);
179
}
180

  
181 161
function validateEmail(email) {
182 162
    var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
183 163
    return re.test(email);

Also available in: Unified diff