zydronium/enigma-bbs
1
0
Fork 0
mirror of https://github.com/NuSkooler/enigma-bbs.git synced 2025-06-10 22:54:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

* FSE quote format is now configurable and random if there are 2:n available

Browse source 
* Remove old 3rd party string-format & replace with string_format.js version
* Some fix some bugs with string_format.js padding, width, and number format
This commit is contained in:
Bryan Ashby 2016-09-04 21:36:26 -06:00
parent d4d64f925d
commit f7c21baa52
25 changed files with 128 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/servers/ssh.js
View file

@ -9,6 +9,7 @@ var ServerModule = require('../server_module.js').ServerModule;
var userLogin = require('../user_login.js').userLogin;
var enigVersion = require('../../package.json').version;
var theme = require('../theme.js');
const stringFormat = require('../string_format.js');
var ssh2 = require('ssh2');
var fs = require('fs');
@ -105,12 +106,12 @@ function SSHClient(clientConn) {
theme.getThemeArt(artOpts, function gotArt(err, artInfo) {
if(err) {
interactivePrompt.prompt = 'Access denied\n' + ctx.username + '\'s password: ';
} else {
var newUserNameList = '"' + (Config.users.newUserNames || []).join(', ') + '"';
interactivePrompt.prompt =
'Access denied\n' +
artInfo.data.format( { newUserNames : newUserNameList } ) +
'\n' + ctx.username + '\'s password: ';
} else {
const newUserNameList = _.has(Config, 'users.newUserNames') && Config.users.newUserNames.length > 0 ?
Config.users.newUserNames.map(newName => '"' + newName + '"').join(', ') :
'(No new user names enabled!)';
interactivePrompt.prompt = `Access denied\n${stringFormat(artInfo.data, { newUserNames : newUserNameList })}\n${ctx.username}'s password'`;
}
return ctx.prompt(interactivePrompt, retryPrompt);
});