Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-08 06:55:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #261

Browse Source
This commit is contained in:
Baris Soner Usakli
2013-09-05 12:18:51 -04:00
parent 2f70489e22
commit 1f60578a63
5 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/src/forum/register.js
View File

@@ -31,7 +31,6 @@
function validateEmail() { function validateEmail() {
if(!emailEl.val()) { if(!emailEl.val()) {
validationError = true; validationError = true;
//email_notify.hide();
return; return;
} }
@@ -49,7 +48,6 @@
function validateUsername() { function validateUsername() {
if(!username.val()) { if(!username.val()) {
validationError = true; validationError = true;
//username_notify.hide();
return; return;
} }
@@ -74,14 +72,11 @@
function validatePassword() { function validatePassword() {
if(!password.val()){ if(!password.val()){
validationError = true; validationError = true;
//password_notify.hide();
return; return;
} }
if (password.val().length < config.minimumPasswordLength) { if (password.val().length < config.minimumPasswordLength) {
showError(password_notify, 'Password too short!'); 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())) { } else if(!utils.isPasswordValid(password.val())) {
showError(password_notify, 'Invalid password!'); showError(password_notify, 'Invalid password!');
} else { } else {
@@ -99,7 +94,6 @@
function validatePasswordConfirm() { function validatePasswordConfirm() {
if(!password.val() || password_notify.hasClass('alert-error')) { if(!password.val() || password_notify.hasClass('alert-error')) {
//password_confirm_notify.hide();
return; return;
} }

2
public/templates/admin/settings.tpl
View File

@@ -59,8 +59,6 @@
<input type="text" class="form-control" value="16" data-field="maximumUsernameLength"><br /> <input type="text" class="form-control" value="16" data-field="maximumUsernameLength"><br />
<strong>Minimum Password Length</strong><br /> <strong>Minimum Password Length</strong><br />
<input type="text" class="form-control" value="6" data-field="minimumPasswordLength"><br /> <input type="text" class="form-control" value="6" data-field="minimumPasswordLength"><br />
<strong>Maximum Password Length</strong><br />
<input type="text" class="form-control" value="16" data-field="maximumPasswordLength"><br />
</div> </div>
</form> </form>

2
public/templates/register.tpl
View File

@@ -44,7 +44,7 @@
<span id="password-notify"><i class="icon icon-circle-blank"></i></span> <span id="password-notify"><i class="icon icon-circle-blank"></i></span>
</span> </span>
</div> </div>
<span class="help-block">Your password's length must be {minimumPasswordLength}-{maximumPasswordLength} characters.</span> <span class="help-block">Your password's length must be at least {minimumPasswordLength} characters.</span>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">

1
src/install.js
View File

@@ -90,7 +90,6 @@ var async = require('async'),
meta.configs.set('minimumUsernameLength', 2); meta.configs.set('minimumUsernameLength', 2);
meta.configs.set('maximumUsernameLength', 16); meta.configs.set('maximumUsernameLength', 16);
meta.configs.set('minimumPasswordLength', 6); meta.configs.set('minimumPasswordLength', 6);
meta.configs.set('maximumPasswordLength', 16);
meta.configs.set('imgurClientID', ''); meta.configs.set('imgurClientID', '');
install.save(server_conf, client_conf, callback); install.save(server_conf, client_conf, callback);

2
src/routes/api.js
View File

@@ -25,7 +25,6 @@ var user = require('./../user.js'),
config['minimumUsernameLength'] = meta.config['minimumUsernameLength']; config['minimumUsernameLength'] = meta.config['minimumUsernameLength'];
config['maximumUsernameLength'] = meta.config['maximumUsernameLength']; config['maximumUsernameLength'] = meta.config['maximumUsernameLength'];
config['minimumPasswordLength'] = meta.config['minimumPasswordLength']; config['minimumPasswordLength'] = meta.config['minimumPasswordLength'];
config['maximumPasswordLength'] = meta.config['maximumPasswordLength'];
res.json(200, config); res.json(200, config);
}); });
@@ -104,7 +103,6 @@ var user = require('./../user.js'),
data.minimumUsernameLength = meta.config['minimumUsernameLength']; data.minimumUsernameLength = meta.config['minimumUsernameLength'];
data.maximumUsernameLength = meta.config['maximumUsernameLength']; data.maximumUsernameLength = meta.config['maximumUsernameLength'];
data.minimumPasswordLength = meta.config['minimumPasswordLength']; data.minimumPasswordLength = meta.config['minimumPasswordLength'];
data.maximumPasswordLength = meta.config['maximumPasswordLength'];
res.json(data); res.json(data);
}); });