From 1f60578a63042474a4b218ffd0686df8680fec49 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Thu, 5 Sep 2013 12:18:51 -0400 Subject: [PATCH] closes #261 --- public/src/forum/register.js | 6 ------ public/templates/admin/settings.tpl | 2 -- public/templates/register.tpl | 2 +- src/install.js | 1 - src/routes/api.js | 2 -- 5 files changed, 1 insertion(+), 12 deletions(-) diff --git a/public/src/forum/register.js b/public/src/forum/register.js index 89ee708e5a..4af0af93a2 100644 --- a/public/src/forum/register.js +++ b/public/src/forum/register.js @@ -31,7 +31,6 @@ function validateEmail() { if(!emailEl.val()) { validationError = true; - //email_notify.hide(); return; } @@ -49,7 +48,6 @@ function validateUsername() { if(!username.val()) { validationError = true; - //username_notify.hide(); return; } @@ -74,14 +72,11 @@ function validatePassword() { if(!password.val()){ validationError = true; - //password_notify.hide(); return; } if (password.val().length < config.minimumPasswordLength) { showError(password_notify, 'Password too short!'); - } else if(password.val().length > config.maximumPasswordLength) { - showError(password_notify, 'Password too long!'); } else if(!utils.isPasswordValid(password.val())) { showError(password_notify, 'Invalid password!'); } else { @@ -99,7 +94,6 @@ function validatePasswordConfirm() { if(!password.val() || password_notify.hasClass('alert-error')) { - //password_confirm_notify.hide(); return; } diff --git a/public/templates/admin/settings.tpl b/public/templates/admin/settings.tpl index 2abb800569..c5d85ad578 100644 --- a/public/templates/admin/settings.tpl +++ b/public/templates/admin/settings.tpl @@ -59,8 +59,6 @@
Minimum Password Length

- Maximum Password Length
-
diff --git a/public/templates/register.tpl b/public/templates/register.tpl index 7b50f51566..7cb72b39d3 100644 --- a/public/templates/register.tpl +++ b/public/templates/register.tpl @@ -44,7 +44,7 @@ - Your password's length must be {minimumPasswordLength}-{maximumPasswordLength} characters. + Your password's length must be at least {minimumPasswordLength} characters.
diff --git a/src/install.js b/src/install.js index 22275068bc..e032dc7202 100644 --- a/src/install.js +++ b/src/install.js @@ -90,7 +90,6 @@ var async = require('async'), meta.configs.set('minimumUsernameLength', 2); meta.configs.set('maximumUsernameLength', 16); meta.configs.set('minimumPasswordLength', 6); - meta.configs.set('maximumPasswordLength', 16); meta.configs.set('imgurClientID', ''); install.save(server_conf, client_conf, callback); diff --git a/src/routes/api.js b/src/routes/api.js index 234ed7aa22..84de81e518 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -25,7 +25,6 @@ var user = require('./../user.js'), config['minimumUsernameLength'] = meta.config['minimumUsernameLength']; config['maximumUsernameLength'] = meta.config['maximumUsernameLength']; config['minimumPasswordLength'] = meta.config['minimumPasswordLength']; - config['maximumPasswordLength'] = meta.config['maximumPasswordLength']; res.json(200, config); }); @@ -104,7 +103,6 @@ var user = require('./../user.js'), data.minimumUsernameLength = meta.config['minimumUsernameLength']; data.maximumUsernameLength = meta.config['maximumUsernameLength']; data.minimumPasswordLength = meta.config['minimumPasswordLength']; - data.maximumPasswordLength = meta.config['maximumPasswordLength']; res.json(data); });