From 57d46dd57ea3f5d5675eac85f548b8358b811328 Mon Sep 17 00:00:00 2001 From: David Stephens Date: Wed, 22 Nov 2017 23:27:33 +0000 Subject: [PATCH] Mega rejig! --- {mods/art => art/general}/CONNECT1.ANS | Bin {mods/art => art/general}/DOORMANY.ANS | Bin {mods/art => art/general}/GNSPMPT.ANS | Bin {mods/art => art/general}/LOGPMPT.ANS | Bin {mods/art => art/general}/NEWSCAN.ANS | Bin {mods/art => art/general}/NEWUSER1.ANS | Bin {mods/art => art/general}/ONEADD.ANS | Bin {mods/art => art/general}/ONELINER.ANS | Bin {mods/art => art/general}/PRELOGAD.ANS | Bin {mods/art => art/general}/WELCOME1.ANS | 0 {mods/art => art/general}/WELCOME2.ANS | Bin .../general}/demo_edit_text_view.ans | Bin .../general}/demo_edit_text_view1.ans | Bin .../general}/demo_fse_local_user.ans | Bin .../general}/demo_fse_netmail_body.ans | Bin .../general}/demo_fse_netmail_footer_edit.ans | Bin .../demo_fse_netmail_footer_edit_menu.ans | Bin .../general}/demo_fse_netmail_header.ans | Bin .../general}/demo_fse_netmail_help.ans | Bin .../general}/demo_horizontal_menu_view1.ans | Bin .../general}/demo_mask_edit_text_view1.ans | Bin .../demo_multi_line_edit_text_view1.ans | Bin .../art => art/general}/demo_selection_vm.ans | Bin .../general}/demo_spin_and_toggle.ans | Bin .../general}/demo_vertical_menu_view1.ans | Bin {mods/art => art/general}/erc.ans | Bin {mods/art => art/general}/menu_prompt.ans | Bin .../general}/msg_area_footer_view.ans | Bin {mods/art => art/general}/msg_area_list.ans | Bin .../general}/msg_area_post_header.ans | Bin .../general}/msg_area_view_header.ans | Bin {mods/art => art/general}/test.ans | 0 .../themes/luciano_blocktronics/BBSADD.ANS | Bin .../themes/luciano_blocktronics/BBSLIST.ANS | Bin .../themes/luciano_blocktronics/CCHANGE.ANS | Bin .../themes/luciano_blocktronics/CHANGE.ANS | Bin .../themes/luciano_blocktronics/CONFSCR.ANS | Bin .../themes/luciano_blocktronics/DONE.ANS | Bin .../themes/luciano_blocktronics/DOORMNU.ANS | Bin .../themes/luciano_blocktronics/FAREASEL.ANS | Bin .../themes/luciano_blocktronics/FBHELP.ANS | Bin .../themes/luciano_blocktronics/FBNORES.ANS | Bin .../themes/luciano_blocktronics/FBRWSE.ANS | Bin .../themes/luciano_blocktronics/FDETAIL.ANS | Bin .../themes/luciano_blocktronics/FDETGEN.ANS | Bin .../themes/luciano_blocktronics/FDETLST.ANS | Bin .../themes/luciano_blocktronics/FDETNFO.ANS | Bin .../themes/luciano_blocktronics/FDLMGR.ANS | Bin .../themes/luciano_blocktronics/FEMPTYQ.ANS | Bin .../themes/luciano_blocktronics/FFILEDT.ANS | Bin .../themes/luciano_blocktronics/FILPMPT.ANS | Bin .../themes/luciano_blocktronics/FMENU.ANS | Bin .../themes/luciano_blocktronics/FNEWBRWSE.ANS | Bin .../themes/luciano_blocktronics/FORGOTPW.ANS | Bin .../luciano_blocktronics/FORGOTPWSENT.ANS | Bin .../themes/luciano_blocktronics/FPROSEL.ANS | Bin .../themes/luciano_blocktronics/FSEARCH.ANS | Bin .../themes/luciano_blocktronics/IDLELOG.ANS | Bin .../themes/luciano_blocktronics/LASTCALL.ANS | Bin .../themes/luciano_blocktronics/LETTER.ANS | Bin .../themes/luciano_blocktronics/MAILMNU.ANS | Bin .../themes/luciano_blocktronics/MATRIX.ANS | Bin .../themes/luciano_blocktronics/MMENU.ANS | Bin .../themes/luciano_blocktronics/MNUPRMT.ANS | Bin .../themes/luciano_blocktronics/MSGBODY.ANS | Bin .../themes/luciano_blocktronics/MSGEFTR.ANS | Bin .../themes/luciano_blocktronics/MSGEHDR.ANS | Bin .../themes/luciano_blocktronics/MSGEHLP.ANS | Bin .../themes/luciano_blocktronics/MSGEMFT.ANS | Bin .../themes/luciano_blocktronics/MSGLIST.ANS | Bin .../themes/luciano_blocktronics/MSGMNU.ANS | Bin .../themes/luciano_blocktronics/MSGPMPT.ANS | Bin .../themes/luciano_blocktronics/MSGQUOT.ANS | Bin .../themes/luciano_blocktronics/MSGVFTR.ANS | Bin .../themes/luciano_blocktronics/MSGVHDR.ANS | Bin .../themes/luciano_blocktronics/MSGVHLP.ANS | Bin .../themes/luciano_blocktronics/NEWMSGS.ANS | Bin .../themes/luciano_blocktronics/NUA.ANS | Bin .../themes/luciano_blocktronics/ONEADD.ANS | Bin .../themes/luciano_blocktronics/ONELINER.ANS | Bin .../themes/luciano_blocktronics/PAUSE.ANS | Bin .../themes/luciano_blocktronics/RATEFILE.ANS | Bin .../themes/luciano_blocktronics/RUMORADD.ANS | Bin .../themes/luciano_blocktronics/RUMORS.ANS | Bin .../themes/luciano_blocktronics/STATUS.ANS | Bin .../themes/luciano_blocktronics/SYSSTAT.ANS | Bin .../themes/luciano_blocktronics/TBRIDGE.ANS | Bin .../themes/luciano_blocktronics/TOONODE.ANS | Bin .../themes/luciano_blocktronics/ULCHECK.ANS | Bin .../themes/luciano_blocktronics/ULDETAIL.ANS | Bin .../themes/luciano_blocktronics/ULDUPES.ANS | Bin .../themes/luciano_blocktronics/ULNOAREA.ANS | Bin .../themes/luciano_blocktronics/ULOPTS.ANS | Bin .../themes/luciano_blocktronics/USERLOG.ANS | Bin .../themes/luciano_blocktronics/USERLST.ANS | Bin .../themes/luciano_blocktronics/WHOSON.ANS | Bin .../themes/luciano_blocktronics/theme.hjson | 0 {mods => config}/menu.hjson | 0 {mods => config}/prompt.hjson | 0 core/config.js | 15 ++++---- core/config_util.js | 9 +++-- core/module_util.js | 1 + core/oputil/oputil_common.js | 2 +- mods/{ => system}/abracadabra.js | 10 +++--- mods/{ => system}/bbs_link.js | 6 ++-- mods/{ => system}/bbs_list.js | 14 ++++---- mods/{ => system}/erc_client.js | 4 +-- mods/{ => system}/file_area_filter_edit.js | 10 +++--- mods/{ => system}/file_area_list.js | 34 +++++++++--------- mods/{ => system}/file_base_area_select.js | 8 ++--- .../file_base_download_manager.js | 16 ++++----- mods/{ => system}/file_base_search.js | 8 ++--- .../file_base_web_download_manager.js | 20 +++++------ .../file_transfer_protocol_select.js | 8 ++--- mods/{ => system}/last_callers.js | 10 +++--- mods/{ => system}/msg_area_list.js | 12 +++---- mods/{ => system}/msg_area_post_fse.js | 4 +-- mods/{ => system}/msg_area_reply_fse.js | 2 +- mods/{ => system}/msg_area_view_fse.js | 4 +-- mods/{ => system}/msg_conf_list.js | 12 +++---- mods/{ => system}/msg_list.js | 10 +++--- mods/{ => system}/nua.js | 12 +++---- mods/{ => system}/onelinerz.js | 12 +++---- mods/{ => system}/rumorz.js | 14 ++++---- mods/{ => system}/telnet_bridge.js | 6 ++-- mods/{ => system}/upload.js | 28 +++++++-------- mods/{ => system}/user_list.js | 8 ++--- mods/{ => system}/whos_online.js | 8 ++--- mods/user/.keep | 0 129 files changed, 153 insertions(+), 154 deletions(-) rename {mods/art => art/general}/CONNECT1.ANS (100%) rename {mods/art => art/general}/DOORMANY.ANS (100%) rename {mods/art => art/general}/GNSPMPT.ANS (100%) rename {mods/art => art/general}/LOGPMPT.ANS (100%) rename {mods/art => art/general}/NEWSCAN.ANS (100%) rename {mods/art => art/general}/NEWUSER1.ANS (100%) rename {mods/art => art/general}/ONEADD.ANS (100%) rename {mods/art => art/general}/ONELINER.ANS (100%) rename {mods/art => art/general}/PRELOGAD.ANS (100%) rename {mods/art => art/general}/WELCOME1.ANS (100%) rename {mods/art => art/general}/WELCOME2.ANS (100%) rename {mods/art => art/general}/demo_edit_text_view.ans (100%) rename {mods/art => art/general}/demo_edit_text_view1.ans (100%) rename {mods/art => art/general}/demo_fse_local_user.ans (100%) rename {mods/art => art/general}/demo_fse_netmail_body.ans (100%) rename {mods/art => art/general}/demo_fse_netmail_footer_edit.ans (100%) rename {mods/art => art/general}/demo_fse_netmail_footer_edit_menu.ans (100%) rename {mods/art => art/general}/demo_fse_netmail_header.ans (100%) rename {mods/art => art/general}/demo_fse_netmail_help.ans (100%) rename {mods/art => art/general}/demo_horizontal_menu_view1.ans (100%) rename {mods/art => art/general}/demo_mask_edit_text_view1.ans (100%) rename {mods/art => art/general}/demo_multi_line_edit_text_view1.ans (100%) rename {mods/art => art/general}/demo_selection_vm.ans (100%) rename {mods/art => art/general}/demo_spin_and_toggle.ans (100%) rename {mods/art => art/general}/demo_vertical_menu_view1.ans (100%) rename {mods/art => art/general}/erc.ans (100%) rename {mods/art => art/general}/menu_prompt.ans (100%) rename {mods/art => art/general}/msg_area_footer_view.ans (100%) rename {mods/art => art/general}/msg_area_list.ans (100%) rename {mods/art => art/general}/msg_area_post_header.ans (100%) rename {mods/art => art/general}/msg_area_view_header.ans (100%) rename {mods/art => art/general}/test.ans (100%) rename {mods => art}/themes/luciano_blocktronics/BBSADD.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/BBSLIST.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/CCHANGE.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/CHANGE.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/CONFSCR.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/DONE.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/DOORMNU.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/FAREASEL.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/FBHELP.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/FBNORES.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/FBRWSE.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/FDETAIL.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/FDETGEN.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/FDETLST.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/FDETNFO.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/FDLMGR.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/FEMPTYQ.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/FFILEDT.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/FILPMPT.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/FMENU.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/FNEWBRWSE.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/FORGOTPW.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/FORGOTPWSENT.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/FPROSEL.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/FSEARCH.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/IDLELOG.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/LASTCALL.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/LETTER.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/MAILMNU.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/MATRIX.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/MMENU.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/MNUPRMT.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/MSGBODY.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/MSGEFTR.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/MSGEHDR.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/MSGEHLP.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/MSGEMFT.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/MSGLIST.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/MSGMNU.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/MSGPMPT.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/MSGQUOT.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/MSGVFTR.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/MSGVHDR.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/MSGVHLP.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/NEWMSGS.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/NUA.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/ONEADD.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/ONELINER.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/PAUSE.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/RATEFILE.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/RUMORADD.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/RUMORS.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/STATUS.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/SYSSTAT.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/TBRIDGE.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/TOONODE.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/ULCHECK.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/ULDETAIL.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/ULDUPES.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/ULNOAREA.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/ULOPTS.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/USERLOG.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/USERLST.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/WHOSON.ANS (100%) rename {mods => art}/themes/luciano_blocktronics/theme.hjson (100%) rename {mods => config}/menu.hjson (100%) rename {mods => config}/prompt.hjson (100%) rename mods/{ => system}/abracadabra.js (94%) rename mods/{ => system}/bbs_link.js (96%) rename mods/{ => system}/bbs_list.js (96%) rename mods/{ => system}/erc_client.js (97%) rename mods/{ => system}/file_area_filter_edit.js (95%) rename mods/{ => system}/file_area_list.js (94%) rename mods/{ => system}/file_base_area_select.js (88%) rename mods/{ => system}/file_base_download_manager.js (92%) rename mods/{ => system}/file_base_search.js (89%) rename mods/{ => system}/file_base_web_download_manager.js (91%) rename mods/{ => system}/file_transfer_protocol_select.js (93%) rename mods/{ => system}/last_callers.js (92%) rename mods/{ => system}/msg_area_list.js (91%) rename mods/{ => system}/msg_area_post_fse.js (90%) rename mods/{ => system}/msg_area_reply_fse.js (81%) rename mods/{ => system}/msg_area_view_fse.js (95%) rename mods/{ => system}/msg_conf_list.js (89%) rename mods/{ => system}/msg_list.js (95%) rename mods/{ => system}/nua.js (91%) rename mods/{ => system}/onelinerz.js (95%) rename mods/{ => system}/rumorz.js (92%) rename mods/{ => system}/telnet_bridge.js (94%) rename mods/{ => system}/upload.js (94%) rename mods/{ => system}/user_list.js (91%) rename mods/{ => system}/whos_online.js (87%) create mode 100644 mods/user/.keep diff --git a/mods/art/CONNECT1.ANS b/art/general/CONNECT1.ANS similarity index 100% rename from mods/art/CONNECT1.ANS rename to art/general/CONNECT1.ANS diff --git a/mods/art/DOORMANY.ANS b/art/general/DOORMANY.ANS similarity index 100% rename from mods/art/DOORMANY.ANS rename to art/general/DOORMANY.ANS diff --git a/mods/art/GNSPMPT.ANS b/art/general/GNSPMPT.ANS similarity index 100% rename from mods/art/GNSPMPT.ANS rename to art/general/GNSPMPT.ANS diff --git a/mods/art/LOGPMPT.ANS b/art/general/LOGPMPT.ANS similarity index 100% rename from mods/art/LOGPMPT.ANS rename to art/general/LOGPMPT.ANS diff --git a/mods/art/NEWSCAN.ANS b/art/general/NEWSCAN.ANS similarity index 100% rename from mods/art/NEWSCAN.ANS rename to art/general/NEWSCAN.ANS diff --git a/mods/art/NEWUSER1.ANS b/art/general/NEWUSER1.ANS similarity index 100% rename from mods/art/NEWUSER1.ANS rename to art/general/NEWUSER1.ANS diff --git a/mods/art/ONEADD.ANS b/art/general/ONEADD.ANS similarity index 100% rename from mods/art/ONEADD.ANS rename to art/general/ONEADD.ANS diff --git a/mods/art/ONELINER.ANS b/art/general/ONELINER.ANS similarity index 100% rename from mods/art/ONELINER.ANS rename to art/general/ONELINER.ANS diff --git a/mods/art/PRELOGAD.ANS b/art/general/PRELOGAD.ANS similarity index 100% rename from mods/art/PRELOGAD.ANS rename to art/general/PRELOGAD.ANS diff --git a/mods/art/WELCOME1.ANS b/art/general/WELCOME1.ANS similarity index 100% rename from mods/art/WELCOME1.ANS rename to art/general/WELCOME1.ANS diff --git a/mods/art/WELCOME2.ANS b/art/general/WELCOME2.ANS similarity index 100% rename from mods/art/WELCOME2.ANS rename to art/general/WELCOME2.ANS diff --git a/mods/art/demo_edit_text_view.ans b/art/general/demo_edit_text_view.ans similarity index 100% rename from mods/art/demo_edit_text_view.ans rename to art/general/demo_edit_text_view.ans diff --git a/mods/art/demo_edit_text_view1.ans b/art/general/demo_edit_text_view1.ans similarity index 100% rename from mods/art/demo_edit_text_view1.ans rename to art/general/demo_edit_text_view1.ans diff --git a/mods/art/demo_fse_local_user.ans b/art/general/demo_fse_local_user.ans similarity index 100% rename from mods/art/demo_fse_local_user.ans rename to art/general/demo_fse_local_user.ans diff --git a/mods/art/demo_fse_netmail_body.ans b/art/general/demo_fse_netmail_body.ans similarity index 100% rename from mods/art/demo_fse_netmail_body.ans rename to art/general/demo_fse_netmail_body.ans diff --git a/mods/art/demo_fse_netmail_footer_edit.ans b/art/general/demo_fse_netmail_footer_edit.ans similarity index 100% rename from mods/art/demo_fse_netmail_footer_edit.ans rename to art/general/demo_fse_netmail_footer_edit.ans diff --git a/mods/art/demo_fse_netmail_footer_edit_menu.ans b/art/general/demo_fse_netmail_footer_edit_menu.ans similarity index 100% rename from mods/art/demo_fse_netmail_footer_edit_menu.ans rename to art/general/demo_fse_netmail_footer_edit_menu.ans diff --git a/mods/art/demo_fse_netmail_header.ans b/art/general/demo_fse_netmail_header.ans similarity index 100% rename from mods/art/demo_fse_netmail_header.ans rename to art/general/demo_fse_netmail_header.ans diff --git a/mods/art/demo_fse_netmail_help.ans b/art/general/demo_fse_netmail_help.ans similarity index 100% rename from mods/art/demo_fse_netmail_help.ans rename to art/general/demo_fse_netmail_help.ans diff --git a/mods/art/demo_horizontal_menu_view1.ans b/art/general/demo_horizontal_menu_view1.ans similarity index 100% rename from mods/art/demo_horizontal_menu_view1.ans rename to art/general/demo_horizontal_menu_view1.ans diff --git a/mods/art/demo_mask_edit_text_view1.ans b/art/general/demo_mask_edit_text_view1.ans similarity index 100% rename from mods/art/demo_mask_edit_text_view1.ans rename to art/general/demo_mask_edit_text_view1.ans diff --git a/mods/art/demo_multi_line_edit_text_view1.ans b/art/general/demo_multi_line_edit_text_view1.ans similarity index 100% rename from mods/art/demo_multi_line_edit_text_view1.ans rename to art/general/demo_multi_line_edit_text_view1.ans diff --git a/mods/art/demo_selection_vm.ans b/art/general/demo_selection_vm.ans similarity index 100% rename from mods/art/demo_selection_vm.ans rename to art/general/demo_selection_vm.ans diff --git a/mods/art/demo_spin_and_toggle.ans b/art/general/demo_spin_and_toggle.ans similarity index 100% rename from mods/art/demo_spin_and_toggle.ans rename to art/general/demo_spin_and_toggle.ans diff --git a/mods/art/demo_vertical_menu_view1.ans b/art/general/demo_vertical_menu_view1.ans similarity index 100% rename from mods/art/demo_vertical_menu_view1.ans rename to art/general/demo_vertical_menu_view1.ans diff --git a/mods/art/erc.ans b/art/general/erc.ans similarity index 100% rename from mods/art/erc.ans rename to art/general/erc.ans diff --git a/mods/art/menu_prompt.ans b/art/general/menu_prompt.ans similarity index 100% rename from mods/art/menu_prompt.ans rename to art/general/menu_prompt.ans diff --git a/mods/art/msg_area_footer_view.ans b/art/general/msg_area_footer_view.ans similarity index 100% rename from mods/art/msg_area_footer_view.ans rename to art/general/msg_area_footer_view.ans diff --git a/mods/art/msg_area_list.ans b/art/general/msg_area_list.ans similarity index 100% rename from mods/art/msg_area_list.ans rename to art/general/msg_area_list.ans diff --git a/mods/art/msg_area_post_header.ans b/art/general/msg_area_post_header.ans similarity index 100% rename from mods/art/msg_area_post_header.ans rename to art/general/msg_area_post_header.ans diff --git a/mods/art/msg_area_view_header.ans b/art/general/msg_area_view_header.ans similarity index 100% rename from mods/art/msg_area_view_header.ans rename to art/general/msg_area_view_header.ans diff --git a/mods/art/test.ans b/art/general/test.ans similarity index 100% rename from mods/art/test.ans rename to art/general/test.ans diff --git a/mods/themes/luciano_blocktronics/BBSADD.ANS b/art/themes/luciano_blocktronics/BBSADD.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/BBSADD.ANS rename to art/themes/luciano_blocktronics/BBSADD.ANS diff --git a/mods/themes/luciano_blocktronics/BBSLIST.ANS b/art/themes/luciano_blocktronics/BBSLIST.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/BBSLIST.ANS rename to art/themes/luciano_blocktronics/BBSLIST.ANS diff --git a/mods/themes/luciano_blocktronics/CCHANGE.ANS b/art/themes/luciano_blocktronics/CCHANGE.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/CCHANGE.ANS rename to art/themes/luciano_blocktronics/CCHANGE.ANS diff --git a/mods/themes/luciano_blocktronics/CHANGE.ANS b/art/themes/luciano_blocktronics/CHANGE.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/CHANGE.ANS rename to art/themes/luciano_blocktronics/CHANGE.ANS diff --git a/mods/themes/luciano_blocktronics/CONFSCR.ANS b/art/themes/luciano_blocktronics/CONFSCR.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/CONFSCR.ANS rename to art/themes/luciano_blocktronics/CONFSCR.ANS diff --git a/mods/themes/luciano_blocktronics/DONE.ANS b/art/themes/luciano_blocktronics/DONE.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/DONE.ANS rename to art/themes/luciano_blocktronics/DONE.ANS diff --git a/mods/themes/luciano_blocktronics/DOORMNU.ANS b/art/themes/luciano_blocktronics/DOORMNU.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/DOORMNU.ANS rename to art/themes/luciano_blocktronics/DOORMNU.ANS diff --git a/mods/themes/luciano_blocktronics/FAREASEL.ANS b/art/themes/luciano_blocktronics/FAREASEL.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/FAREASEL.ANS rename to art/themes/luciano_blocktronics/FAREASEL.ANS diff --git a/mods/themes/luciano_blocktronics/FBHELP.ANS b/art/themes/luciano_blocktronics/FBHELP.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/FBHELP.ANS rename to art/themes/luciano_blocktronics/FBHELP.ANS diff --git a/mods/themes/luciano_blocktronics/FBNORES.ANS b/art/themes/luciano_blocktronics/FBNORES.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/FBNORES.ANS rename to art/themes/luciano_blocktronics/FBNORES.ANS diff --git a/mods/themes/luciano_blocktronics/FBRWSE.ANS b/art/themes/luciano_blocktronics/FBRWSE.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/FBRWSE.ANS rename to art/themes/luciano_blocktronics/FBRWSE.ANS diff --git a/mods/themes/luciano_blocktronics/FDETAIL.ANS b/art/themes/luciano_blocktronics/FDETAIL.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/FDETAIL.ANS rename to art/themes/luciano_blocktronics/FDETAIL.ANS diff --git a/mods/themes/luciano_blocktronics/FDETGEN.ANS b/art/themes/luciano_blocktronics/FDETGEN.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/FDETGEN.ANS rename to art/themes/luciano_blocktronics/FDETGEN.ANS diff --git a/mods/themes/luciano_blocktronics/FDETLST.ANS b/art/themes/luciano_blocktronics/FDETLST.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/FDETLST.ANS rename to art/themes/luciano_blocktronics/FDETLST.ANS diff --git a/mods/themes/luciano_blocktronics/FDETNFO.ANS b/art/themes/luciano_blocktronics/FDETNFO.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/FDETNFO.ANS rename to art/themes/luciano_blocktronics/FDETNFO.ANS diff --git a/mods/themes/luciano_blocktronics/FDLMGR.ANS b/art/themes/luciano_blocktronics/FDLMGR.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/FDLMGR.ANS rename to art/themes/luciano_blocktronics/FDLMGR.ANS diff --git a/mods/themes/luciano_blocktronics/FEMPTYQ.ANS b/art/themes/luciano_blocktronics/FEMPTYQ.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/FEMPTYQ.ANS rename to art/themes/luciano_blocktronics/FEMPTYQ.ANS diff --git a/mods/themes/luciano_blocktronics/FFILEDT.ANS b/art/themes/luciano_blocktronics/FFILEDT.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/FFILEDT.ANS rename to art/themes/luciano_blocktronics/FFILEDT.ANS diff --git a/mods/themes/luciano_blocktronics/FILPMPT.ANS b/art/themes/luciano_blocktronics/FILPMPT.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/FILPMPT.ANS rename to art/themes/luciano_blocktronics/FILPMPT.ANS diff --git a/mods/themes/luciano_blocktronics/FMENU.ANS b/art/themes/luciano_blocktronics/FMENU.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/FMENU.ANS rename to art/themes/luciano_blocktronics/FMENU.ANS diff --git a/mods/themes/luciano_blocktronics/FNEWBRWSE.ANS b/art/themes/luciano_blocktronics/FNEWBRWSE.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/FNEWBRWSE.ANS rename to art/themes/luciano_blocktronics/FNEWBRWSE.ANS diff --git a/mods/themes/luciano_blocktronics/FORGOTPW.ANS b/art/themes/luciano_blocktronics/FORGOTPW.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/FORGOTPW.ANS rename to art/themes/luciano_blocktronics/FORGOTPW.ANS diff --git a/mods/themes/luciano_blocktronics/FORGOTPWSENT.ANS b/art/themes/luciano_blocktronics/FORGOTPWSENT.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/FORGOTPWSENT.ANS rename to art/themes/luciano_blocktronics/FORGOTPWSENT.ANS diff --git a/mods/themes/luciano_blocktronics/FPROSEL.ANS b/art/themes/luciano_blocktronics/FPROSEL.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/FPROSEL.ANS rename to art/themes/luciano_blocktronics/FPROSEL.ANS diff --git a/mods/themes/luciano_blocktronics/FSEARCH.ANS b/art/themes/luciano_blocktronics/FSEARCH.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/FSEARCH.ANS rename to art/themes/luciano_blocktronics/FSEARCH.ANS diff --git a/mods/themes/luciano_blocktronics/IDLELOG.ANS b/art/themes/luciano_blocktronics/IDLELOG.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/IDLELOG.ANS rename to art/themes/luciano_blocktronics/IDLELOG.ANS diff --git a/mods/themes/luciano_blocktronics/LASTCALL.ANS b/art/themes/luciano_blocktronics/LASTCALL.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/LASTCALL.ANS rename to art/themes/luciano_blocktronics/LASTCALL.ANS diff --git a/mods/themes/luciano_blocktronics/LETTER.ANS b/art/themes/luciano_blocktronics/LETTER.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/LETTER.ANS rename to art/themes/luciano_blocktronics/LETTER.ANS diff --git a/mods/themes/luciano_blocktronics/MAILMNU.ANS b/art/themes/luciano_blocktronics/MAILMNU.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/MAILMNU.ANS rename to art/themes/luciano_blocktronics/MAILMNU.ANS diff --git a/mods/themes/luciano_blocktronics/MATRIX.ANS b/art/themes/luciano_blocktronics/MATRIX.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/MATRIX.ANS rename to art/themes/luciano_blocktronics/MATRIX.ANS diff --git a/mods/themes/luciano_blocktronics/MMENU.ANS b/art/themes/luciano_blocktronics/MMENU.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/MMENU.ANS rename to art/themes/luciano_blocktronics/MMENU.ANS diff --git a/mods/themes/luciano_blocktronics/MNUPRMT.ANS b/art/themes/luciano_blocktronics/MNUPRMT.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/MNUPRMT.ANS rename to art/themes/luciano_blocktronics/MNUPRMT.ANS diff --git a/mods/themes/luciano_blocktronics/MSGBODY.ANS b/art/themes/luciano_blocktronics/MSGBODY.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/MSGBODY.ANS rename to art/themes/luciano_blocktronics/MSGBODY.ANS diff --git a/mods/themes/luciano_blocktronics/MSGEFTR.ANS b/art/themes/luciano_blocktronics/MSGEFTR.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/MSGEFTR.ANS rename to art/themes/luciano_blocktronics/MSGEFTR.ANS diff --git a/mods/themes/luciano_blocktronics/MSGEHDR.ANS b/art/themes/luciano_blocktronics/MSGEHDR.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/MSGEHDR.ANS rename to art/themes/luciano_blocktronics/MSGEHDR.ANS diff --git a/mods/themes/luciano_blocktronics/MSGEHLP.ANS b/art/themes/luciano_blocktronics/MSGEHLP.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/MSGEHLP.ANS rename to art/themes/luciano_blocktronics/MSGEHLP.ANS diff --git a/mods/themes/luciano_blocktronics/MSGEMFT.ANS b/art/themes/luciano_blocktronics/MSGEMFT.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/MSGEMFT.ANS rename to art/themes/luciano_blocktronics/MSGEMFT.ANS diff --git a/mods/themes/luciano_blocktronics/MSGLIST.ANS b/art/themes/luciano_blocktronics/MSGLIST.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/MSGLIST.ANS rename to art/themes/luciano_blocktronics/MSGLIST.ANS diff --git a/mods/themes/luciano_blocktronics/MSGMNU.ANS b/art/themes/luciano_blocktronics/MSGMNU.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/MSGMNU.ANS rename to art/themes/luciano_blocktronics/MSGMNU.ANS diff --git a/mods/themes/luciano_blocktronics/MSGPMPT.ANS b/art/themes/luciano_blocktronics/MSGPMPT.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/MSGPMPT.ANS rename to art/themes/luciano_blocktronics/MSGPMPT.ANS diff --git a/mods/themes/luciano_blocktronics/MSGQUOT.ANS b/art/themes/luciano_blocktronics/MSGQUOT.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/MSGQUOT.ANS rename to art/themes/luciano_blocktronics/MSGQUOT.ANS diff --git a/mods/themes/luciano_blocktronics/MSGVFTR.ANS b/art/themes/luciano_blocktronics/MSGVFTR.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/MSGVFTR.ANS rename to art/themes/luciano_blocktronics/MSGVFTR.ANS diff --git a/mods/themes/luciano_blocktronics/MSGVHDR.ANS b/art/themes/luciano_blocktronics/MSGVHDR.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/MSGVHDR.ANS rename to art/themes/luciano_blocktronics/MSGVHDR.ANS diff --git a/mods/themes/luciano_blocktronics/MSGVHLP.ANS b/art/themes/luciano_blocktronics/MSGVHLP.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/MSGVHLP.ANS rename to art/themes/luciano_blocktronics/MSGVHLP.ANS diff --git a/mods/themes/luciano_blocktronics/NEWMSGS.ANS b/art/themes/luciano_blocktronics/NEWMSGS.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/NEWMSGS.ANS rename to art/themes/luciano_blocktronics/NEWMSGS.ANS diff --git a/mods/themes/luciano_blocktronics/NUA.ANS b/art/themes/luciano_blocktronics/NUA.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/NUA.ANS rename to art/themes/luciano_blocktronics/NUA.ANS diff --git a/mods/themes/luciano_blocktronics/ONEADD.ANS b/art/themes/luciano_blocktronics/ONEADD.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/ONEADD.ANS rename to art/themes/luciano_blocktronics/ONEADD.ANS diff --git a/mods/themes/luciano_blocktronics/ONELINER.ANS b/art/themes/luciano_blocktronics/ONELINER.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/ONELINER.ANS rename to art/themes/luciano_blocktronics/ONELINER.ANS diff --git a/mods/themes/luciano_blocktronics/PAUSE.ANS b/art/themes/luciano_blocktronics/PAUSE.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/PAUSE.ANS rename to art/themes/luciano_blocktronics/PAUSE.ANS diff --git a/mods/themes/luciano_blocktronics/RATEFILE.ANS b/art/themes/luciano_blocktronics/RATEFILE.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/RATEFILE.ANS rename to art/themes/luciano_blocktronics/RATEFILE.ANS diff --git a/mods/themes/luciano_blocktronics/RUMORADD.ANS b/art/themes/luciano_blocktronics/RUMORADD.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/RUMORADD.ANS rename to art/themes/luciano_blocktronics/RUMORADD.ANS diff --git a/mods/themes/luciano_blocktronics/RUMORS.ANS b/art/themes/luciano_blocktronics/RUMORS.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/RUMORS.ANS rename to art/themes/luciano_blocktronics/RUMORS.ANS diff --git a/mods/themes/luciano_blocktronics/STATUS.ANS b/art/themes/luciano_blocktronics/STATUS.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/STATUS.ANS rename to art/themes/luciano_blocktronics/STATUS.ANS diff --git a/mods/themes/luciano_blocktronics/SYSSTAT.ANS b/art/themes/luciano_blocktronics/SYSSTAT.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/SYSSTAT.ANS rename to art/themes/luciano_blocktronics/SYSSTAT.ANS diff --git a/mods/themes/luciano_blocktronics/TBRIDGE.ANS b/art/themes/luciano_blocktronics/TBRIDGE.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/TBRIDGE.ANS rename to art/themes/luciano_blocktronics/TBRIDGE.ANS diff --git a/mods/themes/luciano_blocktronics/TOONODE.ANS b/art/themes/luciano_blocktronics/TOONODE.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/TOONODE.ANS rename to art/themes/luciano_blocktronics/TOONODE.ANS diff --git a/mods/themes/luciano_blocktronics/ULCHECK.ANS b/art/themes/luciano_blocktronics/ULCHECK.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/ULCHECK.ANS rename to art/themes/luciano_blocktronics/ULCHECK.ANS diff --git a/mods/themes/luciano_blocktronics/ULDETAIL.ANS b/art/themes/luciano_blocktronics/ULDETAIL.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/ULDETAIL.ANS rename to art/themes/luciano_blocktronics/ULDETAIL.ANS diff --git a/mods/themes/luciano_blocktronics/ULDUPES.ANS b/art/themes/luciano_blocktronics/ULDUPES.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/ULDUPES.ANS rename to art/themes/luciano_blocktronics/ULDUPES.ANS diff --git a/mods/themes/luciano_blocktronics/ULNOAREA.ANS b/art/themes/luciano_blocktronics/ULNOAREA.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/ULNOAREA.ANS rename to art/themes/luciano_blocktronics/ULNOAREA.ANS diff --git a/mods/themes/luciano_blocktronics/ULOPTS.ANS b/art/themes/luciano_blocktronics/ULOPTS.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/ULOPTS.ANS rename to art/themes/luciano_blocktronics/ULOPTS.ANS diff --git a/mods/themes/luciano_blocktronics/USERLOG.ANS b/art/themes/luciano_blocktronics/USERLOG.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/USERLOG.ANS rename to art/themes/luciano_blocktronics/USERLOG.ANS diff --git a/mods/themes/luciano_blocktronics/USERLST.ANS b/art/themes/luciano_blocktronics/USERLST.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/USERLST.ANS rename to art/themes/luciano_blocktronics/USERLST.ANS diff --git a/mods/themes/luciano_blocktronics/WHOSON.ANS b/art/themes/luciano_blocktronics/WHOSON.ANS similarity index 100% rename from mods/themes/luciano_blocktronics/WHOSON.ANS rename to art/themes/luciano_blocktronics/WHOSON.ANS diff --git a/mods/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson similarity index 100% rename from mods/themes/luciano_blocktronics/theme.hjson rename to art/themes/luciano_blocktronics/theme.hjson diff --git a/mods/menu.hjson b/config/menu.hjson similarity index 100% rename from mods/menu.hjson rename to config/menu.hjson diff --git a/mods/prompt.hjson b/config/prompt.hjson similarity index 100% rename from mods/prompt.hjson rename to config/prompt.hjson diff --git a/core/config.js b/core/config.js index 367143b6..fa7d346c 100644 --- a/core/config.js +++ b/core/config.js @@ -111,11 +111,8 @@ function init(configPath, options, cb) { } function getDefaultPath() { - const base = miscUtil.resolvePath('~/'); - if(base) { - // e.g. /home/users/joeuser/.config/enigma-bbs/config.hjson - return paths.join(base, '.config', 'enigma-bbs', 'config.hjson'); - } + // e.g. /enigma-bbs-install-path/config/config.hjson + return './config/config.hjson'; } function getDefaultConfig() { @@ -193,15 +190,17 @@ function getDefaultConfig() { }, paths : { - mods : paths.join(__dirname, './../mods/'), + config : paths.join(__dirname, './../config/'), + mods : paths.join(__dirname, './../mods/system'), + userMods : paths.join(__dirname, './../mods/user'), loginServers : paths.join(__dirname, './servers/login/'), contentServers : paths.join(__dirname, './servers/content/'), scannerTossers : paths.join(__dirname, './scanner_tossers/'), mailers : paths.join(__dirname, './mailers/') , - art : paths.join(__dirname, './../mods/art/'), - themes : paths.join(__dirname, './../mods/themes/'), + art : paths.join(__dirname, './../art/general/'), + themes : paths.join(__dirname, './../art/themes/'), logs : paths.join(__dirname, './../logs/'), // :TODO: set up based on system, e.g. /var/logs/enigmabbs or such db : paths.join(__dirname, './../db/'), modsDb : paths.join(__dirname, './../db/mods/'), diff --git a/core/config_util.js b/core/config_util.js index f078f758..3ed7b98c 100644 --- a/core/config_util.js +++ b/core/config_util.js @@ -1,16 +1,15 @@ /* jslint node: true */ 'use strict'; - -var configCache = require('./config_cache.js'); - -var paths = require('path'); +const Config = require('./config.js').config; +const configCache = require('./config_cache.js'); +const paths = require('path'); exports.getFullConfig = getFullConfig; function getFullConfig(filePath, cb) { // |filePath| is assumed to be in 'mods' if it's only a file name if('.' === paths.dirname(filePath)) { - filePath = paths.join(__dirname, '../mods', filePath); + filePath = paths.join(Config.paths.config, filePath); } configCache.getConfig(filePath, function loaded(err, configJson) { diff --git a/core/module_util.js b/core/module_util.js index 67e87306..b730d0ca 100644 --- a/core/module_util.js +++ b/core/module_util.js @@ -102,6 +102,7 @@ function loadModulesForCategory(category, iterator, complete) { function getModulePaths() { return [ Config.paths.mods, + Config.paths.userMods, Config.paths.loginServers, Config.paths.contentServers, Config.paths.scannerTossers, diff --git a/core/oputil/oputil_common.js b/core/oputil/oputil_common.js index 21e1a6d0..14edd518 100644 --- a/core/oputil/oputil_common.js +++ b/core/oputil/oputil_common.js @@ -45,7 +45,7 @@ function printUsageAndSetExitCode(errMsg, exitCode) { } function getDefaultConfigPath() { - return resolvePath('~/.config/enigma-bbs/config.hjson'); + return './config/config.hjson'; } function getConfigPath() { diff --git a/mods/abracadabra.js b/mods/system/abracadabra.js similarity index 94% rename from mods/abracadabra.js rename to mods/system/abracadabra.js index a84d2c63..595f84d4 100644 --- a/mods/abracadabra.js +++ b/mods/system/abracadabra.js @@ -1,11 +1,11 @@ /* jslint node: true */ 'use strict'; -const MenuModule = require('../core/menu_module.js').MenuModule; -const DropFile = require('../core/dropfile.js').DropFile; -const door = require('../core/door.js'); -const theme = require('../core/theme.js'); -const ansi = require('../core/ansi_term.js'); +const MenuModule = require('../../core/menu_module.js').MenuModule; +const DropFile = require('../../core/dropfile.js').DropFile; +const door = require('../../core/door.js'); +const theme = require('../../core/theme.js'); +const ansi = require('../../core/ansi_term.js'); const async = require('async'); const assert = require('assert'); diff --git a/mods/bbs_link.js b/mods/system/bbs_link.js similarity index 96% rename from mods/bbs_link.js rename to mods/system/bbs_link.js index 0cf0a5db..1d5492df 100644 --- a/mods/bbs_link.js +++ b/mods/system/bbs_link.js @@ -1,8 +1,8 @@ /* jslint node: true */ 'use strict'; -const MenuModule = require('../core/menu_module.js').MenuModule; -const resetScreen = require('../core/ansi_term.js').resetScreen; +const MenuModule = require('../../core/menu_module.js').MenuModule; +const resetScreen = require('../../core/ansi_term.js').resetScreen; const async = require('async'); const _ = require('lodash'); @@ -10,7 +10,7 @@ const http = require('http'); const net = require('net'); const crypto = require('crypto'); -const packageJson = require('../package.json'); +const packageJson = require('../../package.json'); /* Expected configuration block: diff --git a/mods/bbs_list.js b/mods/system/bbs_list.js similarity index 96% rename from mods/bbs_list.js rename to mods/system/bbs_list.js index ec964a36..8ae94c6c 100644 --- a/mods/bbs_list.js +++ b/mods/system/bbs_list.js @@ -2,18 +2,18 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../core/menu_module.js').MenuModule; +const MenuModule = require('../../core/menu_module.js').MenuModule; const { getModDatabasePath, getTransactionDatabase -} = require('../core/database.js'); +} = require('../../core/database.js'); -const ViewController = require('../core/view_controller.js').ViewController; -const ansi = require('../core/ansi_term.js'); -const theme = require('../core/theme.js'); -const User = require('../core/user.js'); -const stringFormat = require('../core/string_format.js'); +const ViewController = require('../../core/view_controller.js').ViewController; +const ansi = require('../../core/ansi_term.js'); +const theme = require('../../core/theme.js'); +const User = require('../../core/user.js'); +const stringFormat = require('../../core/string_format.js'); // deps const async = require('async'); diff --git a/mods/erc_client.js b/mods/system/erc_client.js similarity index 97% rename from mods/erc_client.js rename to mods/system/erc_client.js index 02b42ad5..cdc71521 100644 --- a/mods/erc_client.js +++ b/mods/system/erc_client.js @@ -1,8 +1,8 @@ /* jslint node: true */ 'use strict'; -const MenuModule = require('../core/menu_module.js').MenuModule; -const stringFormat = require('../core/string_format.js'); +const MenuModule = require('../../core/menu_module.js').MenuModule; +const stringFormat = require('../../core/string_format.js'); // deps const async = require('async'); diff --git a/mods/file_area_filter_edit.js b/mods/system/file_area_filter_edit.js similarity index 95% rename from mods/file_area_filter_edit.js rename to mods/system/file_area_filter_edit.js index cb3322f9..0ff8b37d 100644 --- a/mods/file_area_filter_edit.js +++ b/mods/system/file_area_filter_edit.js @@ -2,11 +2,11 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../core/menu_module.js').MenuModule; -const ViewController = require('../core/view_controller.js').ViewController; -const getSortedAvailableFileAreas = require('../core/file_base_area.js').getSortedAvailableFileAreas; -const FileBaseFilters = require('../core/file_base_filter.js'); -const stringFormat = require('../core/string_format.js'); +const MenuModule = require('../../core/menu_module.js').MenuModule; +const ViewController = require('../../core/view_controller.js').ViewController; +const getSortedAvailableFileAreas = require('../../core/file_base_area.js').getSortedAvailableFileAreas; +const FileBaseFilters = require('../../core/file_base_filter.js'); +const stringFormat = require('../../core/string_format.js'); // deps const async = require('async'); diff --git a/mods/file_area_list.js b/mods/system/file_area_list.js similarity index 94% rename from mods/file_area_list.js rename to mods/system/file_area_list.js index 0c24f9f8..5359e48e 100644 --- a/mods/file_area_list.js +++ b/mods/system/file_area_list.js @@ -2,23 +2,23 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../core/menu_module.js').MenuModule; -const ViewController = require('../core/view_controller.js').ViewController; -const ansi = require('../core/ansi_term.js'); -const theme = require('../core/theme.js'); -const FileEntry = require('../core/file_entry.js'); -const stringFormat = require('../core/string_format.js'); -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'); -const FileAreaWeb = require('../core/file_area_web.js'); -const FileBaseFilters = require('../core/file_base_filter.js'); -const resolveMimeType = require('../core/mime_util.js').resolveMimeType; -const isAnsi = require('../core/string_util.js').isAnsi; -const controlCodesToAnsi = require('../core/color_codes.js').controlCodesToAnsi; +const MenuModule = require('../../core/menu_module.js').MenuModule; +const ViewController = require('../../core/view_controller.js').ViewController; +const ansi = require('../../core/ansi_term.js'); +const theme = require('../../core/theme.js'); +const FileEntry = require('../../core/file_entry.js'); +const stringFormat = require('../../core/string_format.js'); +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'); +const FileAreaWeb = require('../../core/file_area_web.js'); +const FileBaseFilters = require('../../core/file_base_filter.js'); +const resolveMimeType = require('../../core/mime_util.js').resolveMimeType; +const isAnsi = require('../../core/string_util.js').isAnsi; +const controlCodesToAnsi = require('../../core/color_codes.js').controlCodesToAnsi; // deps const async = require('async'); diff --git a/mods/file_base_area_select.js b/mods/system/file_base_area_select.js similarity index 88% rename from mods/file_base_area_select.js rename to mods/system/file_base_area_select.js index ca182d6c..38b7eba7 100644 --- a/mods/file_base_area_select.js +++ b/mods/system/file_base_area_select.js @@ -2,10 +2,10 @@ 'use strict'; // enigma-bbs -const MenuModule = require('../core/menu_module.js').MenuModule; -const stringFormat = require('../core/string_format.js'); -const getSortedAvailableFileAreas = require('../core/file_base_area.js').getSortedAvailableFileAreas; -const StatLog = require('../core/stat_log.js'); +const MenuModule = require('../../core/menu_module.js').MenuModule; +const stringFormat = require('../../core/string_format.js'); +const getSortedAvailableFileAreas = require('../../core/file_base_area.js').getSortedAvailableFileAreas; +const StatLog = require('../../core/stat_log.js'); // deps const async = require('async'); diff --git a/mods/file_base_download_manager.js b/mods/system/file_base_download_manager.js similarity index 92% rename from mods/file_base_download_manager.js rename to mods/system/file_base_download_manager.js index 382a7305..15a892f1 100644 --- a/mods/file_base_download_manager.js +++ b/mods/system/file_base_download_manager.js @@ -2,14 +2,14 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../core/menu_module.js').MenuModule; -const ViewController = require('../core/view_controller.js').ViewController; -const DownloadQueue = require('../core/download_queue.js'); -const theme = require('../core/theme.js'); -const ansi = require('../core/ansi_term.js'); -const Errors = require('../core/enig_error.js').Errors; -const stringFormat = require('../core/string_format.js'); -const FileAreaWeb = require('../core/file_area_web.js'); +const MenuModule = require('../../core/menu_module.js').MenuModule; +const ViewController = require('../../core/view_controller.js').ViewController; +const DownloadQueue = require('../../core/download_queue.js'); +const theme = require('../../core/theme.js'); +const ansi = require('../../core/ansi_term.js'); +const Errors = require('../../core/enig_error.js').Errors; +const stringFormat = require('../../core/string_format.js'); +const FileAreaWeb = require('../../core/file_area_web.js'); // deps const async = require('async'); diff --git a/mods/file_base_search.js b/mods/system/file_base_search.js similarity index 89% rename from mods/file_base_search.js rename to mods/system/file_base_search.js index e984e1a4..d3ebd1db 100644 --- a/mods/file_base_search.js +++ b/mods/system/file_base_search.js @@ -2,10 +2,10 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../core/menu_module.js').MenuModule; -const ViewController = require('../core/view_controller.js').ViewController; -const getSortedAvailableFileAreas = require('../core/file_base_area.js').getSortedAvailableFileAreas; -const FileBaseFilters = require('../core/file_base_filter.js'); +const MenuModule = require('../../core/menu_module.js').MenuModule; +const ViewController = require('../../core/view_controller.js').ViewController; +const getSortedAvailableFileAreas = require('../../core/file_base_area.js').getSortedAvailableFileAreas; +const FileBaseFilters = require('../../core/file_base_filter.js'); // deps const async = require('async'); diff --git a/mods/file_base_web_download_manager.js b/mods/system/file_base_web_download_manager.js similarity index 91% rename from mods/file_base_web_download_manager.js rename to mods/system/file_base_web_download_manager.js index d171cfdb..9acad951 100644 --- a/mods/file_base_web_download_manager.js +++ b/mods/system/file_base_web_download_manager.js @@ -2,16 +2,16 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../core/menu_module.js').MenuModule; -const ViewController = require('../core/view_controller.js').ViewController; -const DownloadQueue = require('../core/download_queue.js'); -const theme = require('../core/theme.js'); -const ansi = require('../core/ansi_term.js'); -const Errors = require('../core/enig_error.js').Errors; -const stringFormat = require('../core/string_format.js'); -const FileAreaWeb = require('../core/file_area_web.js'); -const ErrNotEnabled = require('../core/enig_error.js').ErrorReasons.NotEnabled; -const Config = require('../core/config.js').config; +const MenuModule = require('../../core/menu_module.js').MenuModule; +const ViewController = require('../../core/view_controller.js').ViewController; +const DownloadQueue = require('../../core/download_queue.js'); +const theme = require('../../core/theme.js'); +const ansi = require('../../core/ansi_term.js'); +const Errors = require('../../core/enig_error.js').Errors; +const stringFormat = require('../../core/string_format.js'); +const FileAreaWeb = require('../../core/file_area_web.js'); +const ErrNotEnabled = require('../../core/enig_error.js').ErrorReasons.NotEnabled; +const Config = require('../../core/config.js').config; // deps const async = require('async'); diff --git a/mods/file_transfer_protocol_select.js b/mods/system/file_transfer_protocol_select.js similarity index 93% rename from mods/file_transfer_protocol_select.js rename to mods/system/file_transfer_protocol_select.js index 6efa5a93..c731dff2 100644 --- a/mods/file_transfer_protocol_select.js +++ b/mods/system/file_transfer_protocol_select.js @@ -2,10 +2,10 @@ 'use strict'; // enigma-bbs -const MenuModule = require('../core/menu_module.js').MenuModule; -const Config = require('../core/config.js').config; -const stringFormat = require('../core/string_format.js'); -const ViewController = require('../core/view_controller.js').ViewController; +const MenuModule = require('../../core/menu_module.js').MenuModule; +const Config = require('../../core/config.js').config; +const stringFormat = require('../../core/string_format.js'); +const ViewController = require('../../core/view_controller.js').ViewController; // deps const async = require('async'); diff --git a/mods/last_callers.js b/mods/system/last_callers.js similarity index 92% rename from mods/last_callers.js rename to mods/system/last_callers.js index afb429d8..85d4bef0 100644 --- a/mods/last_callers.js +++ b/mods/system/last_callers.js @@ -2,11 +2,11 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../core/menu_module.js').MenuModule; -const ViewController = require('../core/view_controller.js').ViewController; -const StatLog = require('../core/stat_log.js'); -const User = require('../core/user.js'); -const stringFormat = require('../core/string_format.js'); +const MenuModule = require('../../core/menu_module.js').MenuModule; +const ViewController = require('../../core/view_controller.js').ViewController; +const StatLog = require('../../core/stat_log.js'); +const User = require('../../core/user.js'); +const stringFormat = require('../../core/string_format.js'); // deps const moment = require('moment'); diff --git a/mods/msg_area_list.js b/mods/system/msg_area_list.js similarity index 91% rename from mods/msg_area_list.js rename to mods/system/msg_area_list.js index a6a0df4c..51b18953 100644 --- a/mods/msg_area_list.js +++ b/mods/system/msg_area_list.js @@ -2,12 +2,12 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../core/menu_module.js').MenuModule; -const ViewController = require('../core/view_controller.js').ViewController; -const messageArea = require('../core/message_area.js'); -const displayThemeArt = require('../core/theme.js').displayThemeArt; -const resetScreen = require('../core/ansi_term.js').resetScreen; -const stringFormat = require('../core/string_format.js'); +const MenuModule = require('../../core/menu_module.js').MenuModule; +const ViewController = require('../../core/view_controller.js').ViewController; +const messageArea = require('../../core/message_area.js'); +const displayThemeArt = require('../../core/theme.js').displayThemeArt; +const resetScreen = require('../../core/ansi_term.js').resetScreen; +const stringFormat = require('../../core/string_format.js'); // deps const async = require('async'); diff --git a/mods/msg_area_post_fse.js b/mods/system/msg_area_post_fse.js similarity index 90% rename from mods/msg_area_post_fse.js rename to mods/system/msg_area_post_fse.js index 21b5d068..a0671f85 100644 --- a/mods/msg_area_post_fse.js +++ b/mods/system/msg_area_post_fse.js @@ -1,8 +1,8 @@ /* jslint node: true */ 'use strict'; -const FullScreenEditorModule = require('../core/fse.js').FullScreenEditorModule; -const persistMessage = require('../core/message_area.js').persistMessage; +const FullScreenEditorModule = require('../../core/fse.js').FullScreenEditorModule; +const persistMessage = require('../../core/message_area.js').persistMessage; const _ = require('lodash'); const async = require('async'); diff --git a/mods/msg_area_reply_fse.js b/mods/system/msg_area_reply_fse.js similarity index 81% rename from mods/msg_area_reply_fse.js rename to mods/system/msg_area_reply_fse.js index d1cb5faa..497c8de7 100644 --- a/mods/msg_area_reply_fse.js +++ b/mods/system/msg_area_reply_fse.js @@ -1,7 +1,7 @@ /* jslint node: true */ 'use strict'; -var FullScreenEditorModule = require('../core/fse.js').FullScreenEditorModule; +var FullScreenEditorModule = require('../../core/fse.js').FullScreenEditorModule; exports.getModule = AreaReplyFSEModule; diff --git a/mods/msg_area_view_fse.js b/mods/system/msg_area_view_fse.js similarity index 95% rename from mods/msg_area_view_fse.js rename to mods/system/msg_area_view_fse.js index de4657f1..7cb5a1b8 100644 --- a/mods/msg_area_view_fse.js +++ b/mods/system/msg_area_view_fse.js @@ -2,8 +2,8 @@ 'use strict'; // ENiGMA½ -const FullScreenEditorModule = require('../core/fse.js').FullScreenEditorModule; -const Message = require('../core/message.js'); +const FullScreenEditorModule = require('../../core/fse.js').FullScreenEditorModule; +const Message = require('../../core/message.js'); // deps const _ = require('lodash'); diff --git a/mods/msg_conf_list.js b/mods/system/msg_conf_list.js similarity index 89% rename from mods/msg_conf_list.js rename to mods/system/msg_conf_list.js index 91c24de4..06e9d59b 100644 --- a/mods/msg_conf_list.js +++ b/mods/system/msg_conf_list.js @@ -2,12 +2,12 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../core/menu_module.js').MenuModule; -const ViewController = require('../core/view_controller.js').ViewController; -const messageArea = require('../core/message_area.js'); -const displayThemeArt = require('../core/theme.js').displayThemeArt; -const resetScreen = require('../core/ansi_term.js').resetScreen; -const stringFormat = require('../core/string_format.js'); +const MenuModule = require('../../core/menu_module.js').MenuModule; +const ViewController = require('../../core/view_controller.js').ViewController; +const messageArea = require('../../core/message_area.js'); +const displayThemeArt = require('../../core/theme.js').displayThemeArt; +const resetScreen = require('../../core/ansi_term.js').resetScreen; +const stringFormat = require('../../core/string_format.js'); // deps const async = require('async'); diff --git a/mods/msg_list.js b/mods/system/msg_list.js similarity index 95% rename from mods/msg_list.js rename to mods/system/msg_list.js index bc80e27b..28d1b609 100644 --- a/mods/msg_list.js +++ b/mods/system/msg_list.js @@ -2,11 +2,11 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../core/menu_module.js').MenuModule; -const ViewController = require('../core/view_controller.js').ViewController; -const messageArea = require('../core/message_area.js'); -const stringFormat = require('../core/string_format.js'); -const MessageAreaConfTempSwitcher = require('../core/mod_mixins.js').MessageAreaConfTempSwitcher; +const MenuModule = require('../../core/menu_module.js').MenuModule; +const ViewController = require('../../core/view_controller.js').ViewController; +const messageArea = require('../../core/message_area.js'); +const stringFormat = require('../../core/string_format.js'); +const MessageAreaConfTempSwitcher = require('../../core/mod_mixins.js').MessageAreaConfTempSwitcher; // deps const async = require('async'); diff --git a/mods/nua.js b/mods/system/nua.js similarity index 91% rename from mods/nua.js rename to mods/system/nua.js index 878e0581..7b4611d6 100644 --- a/mods/nua.js +++ b/mods/system/nua.js @@ -2,12 +2,12 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../core/menu_module.js').MenuModule; -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; -const messageArea = require('../core/message_area.js'); +const MenuModule = require('../../core/menu_module.js').MenuModule; +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; +const messageArea = require('../../core/message_area.js'); exports.moduleInfo = { name : 'NUA', diff --git a/mods/onelinerz.js b/mods/system/onelinerz.js similarity index 95% rename from mods/onelinerz.js rename to mods/system/onelinerz.js index 065c0a30..416124c6 100644 --- a/mods/onelinerz.js +++ b/mods/system/onelinerz.js @@ -2,17 +2,17 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../core/menu_module.js').MenuModule; +const MenuModule = require('../../core/menu_module.js').MenuModule; const { getModDatabasePath, getTransactionDatabase -} = require('../core/database.js'); +} = require('../../core/database.js'); -const ViewController = require('../core/view_controller.js').ViewController; -const theme = require('../core/theme.js'); -const ansi = require('../core/ansi_term.js'); -const stringFormat = require('../core/string_format.js'); +const ViewController = require('../../core/view_controller.js').ViewController; +const theme = require('../../core/theme.js'); +const ansi = require('../../core/ansi_term.js'); +const stringFormat = require('../../core/string_format.js'); // deps const sqlite3 = require('sqlite3'); diff --git a/mods/rumorz.js b/mods/system/rumorz.js similarity index 92% rename from mods/rumorz.js rename to mods/system/rumorz.js index 20aace03..e85271dc 100644 --- a/mods/rumorz.js +++ b/mods/system/rumorz.js @@ -2,13 +2,13 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../core/menu_module.js').MenuModule; -const ViewController = require('../core/view_controller.js').ViewController; -const theme = require('../core/theme.js'); -const resetScreen = require('../core/ansi_term.js').resetScreen; -const StatLog = require('../core/stat_log.js'); -const renderStringLength = require('../core/string_util.js').renderStringLength; -const stringFormat = require('../core/string_format.js'); +const MenuModule = require('../../core/menu_module.js').MenuModule; +const ViewController = require('../../core/view_controller.js').ViewController; +const theme = require('../../core/theme.js'); +const resetScreen = require('../../core/ansi_term.js').resetScreen; +const StatLog = require('../../core/stat_log.js'); +const renderStringLength = require('../../core/string_util.js').renderStringLength; +const stringFormat = require('../../core/string_format.js'); // deps const async = require('async'); diff --git a/mods/telnet_bridge.js b/mods/system/telnet_bridge.js similarity index 94% rename from mods/telnet_bridge.js rename to mods/system/telnet_bridge.js index 1dbb1ae9..42c73217 100644 --- a/mods/telnet_bridge.js +++ b/mods/system/telnet_bridge.js @@ -2,9 +2,9 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../core/menu_module.js').MenuModule; -const resetScreen = require('../core/ansi_term.js').resetScreen; -const setSyncTermFontWithAlias = require('../core/ansi_term.js').setSyncTermFontWithAlias; +const MenuModule = require('../../core/menu_module.js').MenuModule; +const resetScreen = require('../../core/ansi_term.js').resetScreen; +const setSyncTermFontWithAlias = require('../../core/ansi_term.js').setSyncTermFontWithAlias; // deps const async = require('async'); diff --git a/mods/upload.js b/mods/system/upload.js similarity index 94% rename from mods/upload.js rename to mods/system/upload.js index 30c84c48..8e545452 100644 --- a/mods/upload.js +++ b/mods/system/upload.js @@ -2,20 +2,20 @@ 'use strict'; // enigma-bbs -const MenuModule = require('../core/menu_module.js').MenuModule; -const stringFormat = require('../core/string_format.js'); -const getSortedAvailableFileAreas = require('../core/file_base_area.js').getSortedAvailableFileAreas; -const getAreaDefaultStorageDirectory = require('../core/file_base_area.js').getAreaDefaultStorageDirectory; -const scanFile = require('../core/file_base_area.js').scanFile; -const getFileAreaByTag = require('../core/file_base_area.js').getFileAreaByTag; -const getDescFromFileName = require('../core/file_base_area.js').getDescFromFileName; -const ansiGoto = require('../core/ansi_term.js').goto; -const moveFileWithCollisionHandling = require('../core/file_util.js').moveFileWithCollisionHandling; -const pathWithTerminatingSeparator = require('../core/file_util.js').pathWithTerminatingSeparator; -const Log = require('../core/logger.js').log; -const Errors = require('../core/enig_error.js').Errors; -const FileEntry = require('../core/file_entry.js'); -const isAnsi = require('../core/string_util.js').isAnsi; +const MenuModule = require('../../core/menu_module.js').MenuModule; +const stringFormat = require('../../core/string_format.js'); +const getSortedAvailableFileAreas = require('../../core/file_base_area.js').getSortedAvailableFileAreas; +const getAreaDefaultStorageDirectory = require('../../core/file_base_area.js').getAreaDefaultStorageDirectory; +const scanFile = require('../../core/file_base_area.js').scanFile; +const getFileAreaByTag = require('../../core/file_base_area.js').getFileAreaByTag; +const getDescFromFileName = require('../../core/file_base_area.js').getDescFromFileName; +const ansiGoto = require('../../core/ansi_term.js').goto; +const moveFileWithCollisionHandling = require('../../core/file_util.js').moveFileWithCollisionHandling; +const pathWithTerminatingSeparator = require('../../core/file_util.js').pathWithTerminatingSeparator; +const Log = require('../../core/logger.js').log; +const Errors = require('../../core/enig_error.js').Errors; +const FileEntry = require('../../core/file_entry.js'); +const isAnsi = require('../../core/string_util.js').isAnsi; // deps const async = require('async'); diff --git a/mods/user_list.js b/mods/system/user_list.js similarity index 91% rename from mods/user_list.js rename to mods/system/user_list.js index b2a88e79..7b85b331 100644 --- a/mods/user_list.js +++ b/mods/system/user_list.js @@ -1,10 +1,10 @@ /* jslint node: true */ 'use strict'; -const MenuModule = require('../core/menu_module.js').MenuModule; -const User = require('../core/user.js'); -const ViewController = require('../core/view_controller.js').ViewController; -const stringFormat = require('../core/string_format.js'); +const MenuModule = require('../../core/menu_module.js').MenuModule; +const User = require('../../core/user.js'); +const ViewController = require('../../core/view_controller.js').ViewController; +const stringFormat = require('../../core/string_format.js'); const moment = require('moment'); const async = require('async'); diff --git a/mods/whos_online.js b/mods/system/whos_online.js similarity index 87% rename from mods/whos_online.js rename to mods/system/whos_online.js index a0a87829..cec3bb4b 100644 --- a/mods/whos_online.js +++ b/mods/system/whos_online.js @@ -2,10 +2,10 @@ 'use strict'; // ENiGMA½ -const MenuModule = require('../core/menu_module.js').MenuModule; -const ViewController = require('../core/view_controller.js').ViewController; -const getActiveNodeList = require('../core/client_connections.js').getActiveNodeList; -const stringFormat = require('../core/string_format.js'); +const MenuModule = require('../../core/menu_module.js').MenuModule; +const ViewController = require('../../core/view_controller.js').ViewController; +const getActiveNodeList = require('../../core/client_connections.js').getActiveNodeList; +const stringFormat = require('../../core/string_format.js'); // deps const async = require('async'); diff --git a/mods/user/.keep b/mods/user/.keep new file mode 100644 index 00000000..e69de29b