crichardson/enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://numinibsd/git/base/enigma-bbs

Browse Source
This commit is contained in:
Bryan Ashby
2017-02-18 19:02:31 -07:00
parent 08faf5ab1a 6717cd5179
commit b427e79876
24 changed files with 797 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mods/bbs_list.js
View File

@@ -7,7 +7,7 @@ const getModDatabasePath = require('../core/database.js').getModDatabasePath;
const ViewController = require('../core/view_controller.js').ViewController;
const ansi = require('../core/ansi_term.js');
const theme = require('../core/theme.js');
const getUserName = require('../core/user.js').getUserName;
const User = require('../core/user.js');
const stringFormat = require('../core/string_format.js');
// deps
@@ -284,7 +284,7 @@ exports.getModule = class BBSListModule extends MenuModule {
},
function getUserNames(entriesView, callback) {
async.each(self.entries, (entry, next) => {
getUserName(entry.submitterUserId, (err, username) => {
User.getUserName(entry.submitterUserId, (err, username) => {
if(username) {
entry.submitter = username;
} else {

7
mods/file_area_list.js
View File

@@ -11,6 +11,7 @@ const stringFormat = require('../core/string_format.js');
const createCleanAnsi = require('../core/string_util.js').createCleanAnsi;
const FileArea = require('../core/file_base_area.js');
const Errors = require('../core/enig_error.js').Errors;
const ErrNotEnabled = require('../core/enig_error.js').ErrorReasons.NotEnabled;
const ArchiveUtil = require('../core/archive_util.js');
const Config = require('../core/config.js').config;
const DownloadQueue = require('../core/download_queue.js');
@@ -256,8 +257,12 @@ exports.getModule = class FileAreaList extends MenuModule {
FileAreaWeb.getExistingTempDownloadServeItem(this.client, this.currentFileEntry, (err, serveItem) => {
if(err) {
entryInfo.webDlLink = config.webDlLinkNeedsGenerated || 'Not yet generated';
entryInfo.webDlExpire = '';
if(ErrNotEnabled === err.reasonCode) {
entryInfo.webDlExpire = config.webDlLinkNoWebserver || 'Web server is not enabled';
} else {
entryInfo.webDlLink = config.webDlLinkNeedsGenerated || 'Not yet generated';
}
} else {
const webDlExpireTimeFormat = config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';

13
mods/last_callers.js
View File

@@ -5,9 +5,7 @@
const MenuModule = require('../core/menu_module.js').MenuModule;
const ViewController = require('../core/view_controller.js').ViewController;
const StatLog = require('../core/stat_log.js');
const getUserName = require('../core/user.js').getUserName;
const loadProperties = require('../core/user.js').loadProperties;
const isRootUserId = require('../core/user.js').isRootUserId;
const User = require('../core/user.js');
const stringFormat = require('../core/string_format.js');
// deps
@@ -73,7 +71,7 @@ exports.getModule = class LastCallersModule extends MenuModule {
if(self.menuConfig.config.hideSysOpLogin) {
const noOpLoginHistory = loginHistory.filter(lh => {
return false === isRootUserId(parseInt(lh.log_value)); // log_value=userId
return false === User.isRootUserId(parseInt(lh.log_value)); // log_value=userId
});
//
@@ -106,11 +104,10 @@ exports.getModule = class LastCallersModule extends MenuModule {
item.userId = parseInt(item.log_value);
item.ts = moment(item.timestamp).format(dateTimeFormat);
getUserName(item.userId, (err, userName) => {
item.userName = userName;
getPropOpts.userId = item.userId;
User.getUserName(item.userId, (err, userName) => {
item.userName = userName;
loadProperties(getPropOpts, (err, props) => {
User.loadProperties(item.userId, getPropOpts, (err, props) => {
if(!err) {
item.location = props.location;
item.affiliation = item.affils = props.affiliation;

7
mods/msg_area_reply_fse.js
View File

@@ -2,13 +2,6 @@
'use strict';
var FullScreenEditorModule = require('../core/fse.js').FullScreenEditorModule;
var Message = require('../core/message.js');
var messageArea = require('../core/message_area.js');
var user = require('../core/user.js');
var _ = require('lodash');
var async = require('async');
var assert = require('assert');
exports.getModule = AreaReplyFSEModule;

8
mods/nua.js
View File

@@ -3,7 +3,7 @@
// ENiGMA½
const MenuModule = require('../core/menu_module.js').MenuModule;
const user = require('../core/user.js');
const User = require('../core/user.js');
const theme = require('../core/theme.js');
const login = require('../core/system_menu_method.js').login;
const Config = require('../core/config.js').config;
@@ -61,7 +61,7 @@ exports.getModule = class NewUserAppModule extends MenuModule {
// Submit handlers
//
submitApplication : function(formData, extraArgs, cb) {
const newUser = new user.User();
const newUser = new User();
newUser.username = formData.value.username;
@@ -102,7 +102,7 @@ exports.getModule = class NewUserAppModule extends MenuModule {
}
// :TODO: User.create() should validate email uniqueness!
newUser.create( { password : formData.value.password }, err => {
newUser.create(formData.value.password, err => {
if(err) {
self.client.log.info( { error : err, username : formData.value.username }, 'New user creation failed');
@@ -124,7 +124,7 @@ exports.getModule = class NewUserAppModule extends MenuModule {
};
}
if(user.User.AccountStatus.inactive === self.client.user.properties.account_status) {
if(User.AccountStatus.inactive === self.client.user.properties.account_status) {
return self.gotoMenu(extraArgs.inactive, cb);
} else {
//

4
mods/user_list.js
View File

@@ -2,7 +2,7 @@
'use strict';
const MenuModule = require('../core/menu_module.js').MenuModule;
const getUserList = require('../core/user.js').getUserList;
const User = require('../core/user.js');
const ViewController = require('../core/view_controller.js').ViewController;
const stringFormat = require('../core/string_format.js');
@@ -64,7 +64,7 @@ exports.getModule = class UserListModule extends MenuModule {
},
function fetchUserList(callback) {
// :TODO: Currently fetching all users - probably always OK, but this could be paged
getUserList(USER_LIST_OPTS, function got(err, ul) {
User.getUserList(USER_LIST_OPTS, function got(err, ul) {
userList = ul;
callback(err);
});