v1.18.x
Julian Lam 11 years ago
parent c9bb65133a
commit 9e8addee81

@ -6,6 +6,7 @@ define(function() {
var loginData = { var loginData = {
'username': $('#username').val(), 'username': $('#username').val(),
'password': $('#password').val(), 'password': $('#password').val(),
'remember': $('#remember').prop('checked'),
'_csrf': $('#csrf-token').val() '_csrf': $('#csrf-token').val()
}; };

@ -84,18 +84,34 @@
<input type="checkbox" data-field="profile:convertProfileImageToPNG"> <strong>Convert profile image uploads to PNG</strong> <input type="checkbox" data-field="profile:convertProfileImageToPNG"> <strong>Convert profile image uploads to PNG</strong>
</label> </label>
</div> </div>
<label>Maximum User Image File Size</label> <div class="form-group">
<input type="text" class="form-control" placeholder="Maximum size of uploaded user images in kilobytes" data-field="maximumProfileImageSize" /><br /> <label>Days to remember user login sessions</label>
<strong>Minimum Username Length</strong><br /> <input type="text" class="form-control" data-field="loginDays" placeholder="14" />
<input type="text" class="form-control" value="2" data-field="minimumUsernameLength"><br /> </div>
<strong>Maximum Username Length</strong><br /> <div class="form-group">
<input type="text" class="form-control" value="16" data-field="maximumUsernameLength"><br /> <label>Maximum User Image File Size</label>
<strong>Minimum Password Length</strong><br /> <input type="text" class="form-control" placeholder="Maximum size of uploaded user images in kilobytes" data-field="maximumProfileImageSize" />
<input type="text" class="form-control" value="6" data-field="minimumPasswordLength"><br /> </div>
<strong>Maximum Signature Length</strong><br /> <div class="form-group">
<input type="text" class="form-control" value="255" data-field="maximumSignatureLength"><br /> <label>Minimum Username Length</label>
<strong>Forum Terms of Use <small>(Leave blank to disable)</small></strong><br /> <input type="text" class="form-control" value="2" data-field="minimumUsernameLength">
<textarea class="form-control" data-field="termsOfUse"></textarea><br /> </div>
<div class="form-group">
<label>Maximum Username Length</label>
<input type="text" class="form-control" value="16" data-field="maximumUsernameLength">
</div>
<div class="form-group">
<label>Minimum Password Length</label>
<input type="text" class="form-control" value="6" data-field="minimumPasswordLength">
</div>
<div class="form-group">
<label>Maximum Signature Length</label>
<input type="text" class="form-control" value="255" data-field="maximumSignatureLength">
</div>
<div class="form-group">
<label>Forum Terms of Use <small>(Leave blank to disable)</small></label>
<textarea class="form-control" data-field="termsOfUse"></textarea>
</div>
</div> </div>
</form> </form>
</div> </div>

@ -29,15 +29,15 @@
<input class="form-control" type="password" placeholder="[[login:password]]" name="password" id="password" /> <input class="form-control" type="password" placeholder="[[login:password]]" name="password" id="password" />
</div> </div>
</div> </div>
<!-- <div class="form-group"> <div class="form-group">
<div class="col-lg-offset-2 col-lg-10"> <div class="col-lg-offset-2 col-lg-10">
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox"> [[login:remember_me]] <input type="checkbox" name="remember" id="remember" checked /> [[login:remember_me]]
</label> </label>
</div> </div>
</div> </div>
</div> --> </div>
<div class="form-group"> <div class="form-group">
<div class="col-lg-offset-2 col-lg-10"> <div class="col-lg-offset-2 col-lg-10">
<hr /> <hr />

@ -113,6 +113,14 @@
message: info.message message: info.message
}); });
} }
// Alter user cookie depending on passed-in option
if (req.body.remember === 'true') {
req.session.cookie.maxAge = 60*60*24*parseInt(meta.configs.loginDays || 14, 10);
} else {
req.session.cookie.expires = false;
}
req.login({ req.login({
uid: user.uid uid: user.uid
}, function() { }, function() {

Loading…
Cancel
Save