From 5e7a9d99feb59b94ac878872a60f87dda2547666 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Sat, 12 Jan 2019 23:48:32 +0000
Subject: [PATCH] Cruft removal: EmbeddedJavaScriptExt (.bbs) settings - this
option was hidden anyway (here) and never implemented in the web server.
---
src/sbbs3/ctrl/WebCfgDlgUnit.cpp | 3 ---
src/sbbs3/ctrl/WebCfgDlgUnit.dfm | 30 +++---------------------------
src/sbbs3/ctrl/WebCfgDlgUnit.h | 2 --
3 files changed, 3 insertions(+), 32 deletions(-)
diff --git a/src/sbbs3/ctrl/WebCfgDlgUnit.cpp b/src/sbbs3/ctrl/WebCfgDlgUnit.cpp
index 553d6f84fa..0d69f2e2d1 100644
--- a/src/sbbs3/ctrl/WebCfgDlgUnit.cpp
+++ b/src/sbbs3/ctrl/WebCfgDlgUnit.cpp
@@ -87,7 +87,6 @@ void __fastcall TWebCfgDlg::FormShow(TObject *Sender)
HtmlRootEdit->Text=AnsiString(MainForm->web_startup.root_dir);
ErrorSubDirEdit->Text=AnsiString(MainForm->web_startup.error_dir);
CGIDirEdit->Text=AnsiString(MainForm->web_startup.cgi_dir);
- EmbeddedJsExtEdit->Text=AnsiString(MainForm->web_startup.js_ext);
ServerSideJsExtEdit->Text=AnsiString(MainForm->web_startup.ssjs_ext);
CGIContentEdit->Text=AnsiString(MainForm->web_startup.default_cgi_content);
@@ -145,8 +144,6 @@ void __fastcall TWebCfgDlg::OKBtnClick(TObject *Sender)
,ErrorSubDirEdit->Text.c_str());
SAFECOPY(MainForm->web_startup.cgi_dir
,CGIDirEdit->Text.c_str());
- SAFECOPY(MainForm->web_startup.js_ext
- ,EmbeddedJsExtEdit->Text.c_str());
SAFECOPY(MainForm->web_startup.ssjs_ext
,ServerSideJsExtEdit->Text.c_str());
diff --git a/src/sbbs3/ctrl/WebCfgDlgUnit.dfm b/src/sbbs3/ctrl/WebCfgDlgUnit.dfm
index e30cb004a8..d2c6743199 100644
--- a/src/sbbs3/ctrl/WebCfgDlgUnit.dfm
+++ b/src/sbbs3/ctrl/WebCfgDlgUnit.dfm
@@ -25,8 +25,8 @@ object WebCfgDlg: TWebCfgDlg
Top = 3
Width = 278
Height = 199
- ActivePage = GeneralTabSheet
- TabIndex = 0
+ ActivePage = HttpTabSheet
+ TabIndex = 2
TabOrder = 0
object GeneralTabSheet: TTabSheet
Caption = 'General'
@@ -228,16 +228,6 @@ object WebCfgDlg: TWebCfgDlg
AutoSize = False
Caption = 'Server-Side JS File Extension'
end
- object EmbeddedJsExtLabel: TLabel
- Left = 7
- Top = 88
- Width = 143
- Height = 20
- AutoSize = False
- Caption = 'Embedded JS File Extension'
- Enabled = False
- Visible = False
- end
object IndexLabel: TLabel
Left = 7
Top = 62
@@ -278,20 +268,6 @@ object WebCfgDlg: TWebCfgDlg
ShowHint = True
TabOrder = 3
end
- object EmbeddedJsExtEdit: TEdit
- Left = 156
- Top = 88
- Width = 85
- Height = 21
- Hint =
- 'File extension that denotes embedded JavaScript files (e.g. ".bb' +
- 's")'
- Enabled = False
- ParentShowHint = False
- ShowHint = True
- TabOrder = 4
- Visible = False
- end
object VirtualHostsCheckBox: TCheckBox
Left = 7
Top = 140
@@ -301,7 +277,7 @@ object WebCfgDlg: TWebCfgDlg
Caption = 'Virtual Hosts'
ParentShowHint = False
ShowHint = True
- TabOrder = 5
+ TabOrder = 4
end
object IndexFileEdit: TEdit
Left = 85
diff --git a/src/sbbs3/ctrl/WebCfgDlgUnit.h b/src/sbbs3/ctrl/WebCfgDlgUnit.h
index 84254c29fb..c3b4d663f2 100644
--- a/src/sbbs3/ctrl/WebCfgDlgUnit.h
+++ b/src/sbbs3/ctrl/WebCfgDlgUnit.h
@@ -82,8 +82,6 @@ __published: // IDE-managed Components
TButton *ApplyBtn;
TLabel *ErrorSubDirLabel;
TLabel *ServerSideJsExtLabel;
- TLabel *EmbeddedJsExtLabel;
- TEdit *EmbeddedJsExtEdit;
TCheckBox *VirtualHostsCheckBox;
TEdit *LogBaseNameEdit;
TLabel *LogBaseLabel;
--
GitLab