--- sbbs/src/sbbs3/ctrl/mailcfgdlgunit.dfm 2018/04/24 16:41:24 1.1 +++ sbbs/src/sbbs3/ctrl/mailcfgdlgunit.dfm 2018/04/24 16:44:03 1.1.1.2 @@ -1,6 +1,6 @@ object MailCfgDlg: TMailCfgDlg - Left = 501 - Top = 339 + Left = 516 + Top = 157 BorderStyle = bsDialog Caption = 'Mail Server Configuration' ClientHeight = 303 @@ -53,8 +53,8 @@ object MailCfgDlg: TMailCfgDlg Top = 4 Width = 342 Height = 245 - ActivePage = SendMailTabSheet - TabIndex = 3 + ActivePage = DNSBLTabSheet + TabIndex = 6 TabOrder = 3 object GeneralTabSheet: TTabSheet Caption = 'General' @@ -161,14 +161,14 @@ object MailCfgDlg: TMailCfgDlg end object LogFileCheckBox: TCheckBox Left = 185 - Top = 140 + Top = 172 Width = 146 Height = 24 Hint = 'Save log entries to a file (in your DATA directory)' Caption = 'Log to Disk' ParentShowHint = False ShowHint = True - TabOrder = 7 + TabOrder = 9 end object LinesPerYieldEdit: TEdit Left = 113 @@ -191,19 +191,30 @@ object MailCfgDlg: TMailCfgDlg Caption = 'Log Responses' ParentShowHint = False ShowHint = True + TabOrder = 7 + end + object DebugHeadersCheckBox: TCheckBox + Left = 185 + Top = 140 + Width = 146 + Height = 24 + Hint = 'Log all received mail headers (for debugging)' + Caption = 'Log RX Headers' + ParentShowHint = False + ShowHint = True TabOrder = 8 end end object SMTPTabSheet: TTabSheet Caption = 'SMTP' ImageIndex = 1 - object TelnetPortLabel: TLabel + object SMTPPortLabel: TLabel Left = 9 Top = 12 Width = 104 Height = 24 AutoSize = False - Caption = 'Listening Port' + Caption = 'Transfer Port' end object DefaultUserLabel: TLabel Left = 9 @@ -214,8 +225,8 @@ object MailCfgDlg: TMailCfgDlg Caption = 'Default User' end object MaxRecipientsLabel: TLabel - Left = 9 - Top = 44 + Left = 193 + Top = 76 Width = 104 Height = 24 AutoSize = False @@ -229,6 +240,14 @@ object MailCfgDlg: TMailCfgDlg AutoSize = False Caption = 'Max Msg Size' end + object SubPortLabel: TLabel + Left = 9 + Top = 44 + Width = 104 + Height = 24 + AutoSize = False + Caption = 'Submission Port' + end object SMTPPortEdit: TEdit Left = 113 Top = 12 @@ -239,28 +258,17 @@ object MailCfgDlg: TMailCfgDlg ShowHint = True TabOrder = 0 end - object DebugHeadersCheckBox: TCheckBox - Left = 185 - Top = 12 - Width = 146 - Height = 24 - Hint = 'Log all received mail headers (for debugging)' - Caption = 'Log Headers' - ParentShowHint = False - ShowHint = True - TabOrder = 1 - end object DefaultUserEdit: TEdit Left = 113 Top = 108 - Width = 185 + Width = 176 Height = 24 Hint = 'Mail for unknown users will go into this user'#39's mailbox (e.g. "s' + 'ysop")' ParentShowHint = False ShowHint = True - TabOrder = 3 + TabOrder = 6 end object AllowRelayCheckBox: TCheckBox Left = 9 @@ -271,28 +279,28 @@ object MailCfgDlg: TMailCfgDlg Caption = 'Allow Authenticated Users to Relay Mail' ParentShowHint = False ShowHint = True - TabOrder = 4 + TabOrder = 7 OnClick = AllowRelayCheckBoxClick end object MaxRecipientsEdit: TEdit - Left = 113 - Top = 44 - Width = 48 + Left = 296 + Top = 76 + Width = 33 Height = 24 Hint = 'Maximum number of recipients for a single message' ParentShowHint = False ShowHint = True - TabOrder = 2 + TabOrder = 5 end object MaxMsgSizeEdit: TEdit Left = 113 Top = 76 - Width = 80 + Width = 72 Height = 24 Hint = 'Maximum received message size (in bytes)' ParentShowHint = False ShowHint = True - TabOrder = 5 + TabOrder = 4 end object AuthViaIpCheckBox: TCheckBox Left = 9 @@ -305,18 +313,38 @@ object MailCfgDlg: TMailCfgDlg Caption = 'Allow Authentication via POP3, Telnet, etc.' ParentShowHint = False ShowHint = True - TabOrder = 6 + TabOrder = 8 end object NotifyCheckBox: TCheckBox Left = 185 - Top = 44 + Top = 12 Width = 146 Height = 24 Hint = 'Notify local mail recipients of received e-mails' Caption = 'Notify Recipients' ParentShowHint = False ShowHint = True - TabOrder = 7 + TabOrder = 1 + end + object SubPortEdit: TEdit + Left = 113 + Top = 44 + Width = 48 + Height = 24 + Hint = 'TCP port number for incoming SMTP submissions (default=587)' + ParentShowHint = False + ShowHint = True + TabOrder = 2 + end + object UseSubPortCheckBox: TCheckBox + Left = 185 + Top = 44 + Width = 144 + Height = 17 + Hint = 'Enable the SMTP submission port' + Caption = 'Enabled' + TabOrder = 3 + OnClick = UseSubPortCheckBoxClick end end object POP3TabSheet: TTabSheet @@ -412,7 +440,7 @@ object MailCfgDlg: TMailCfgDlg Checked = True ParentShowHint = False ShowHint = True - TabOrder = 3 + TabOrder = 4 TabStop = True OnClick = DNSRadioButtonClick end @@ -424,7 +452,7 @@ object MailCfgDlg: TMailCfgDlg Hint = 'Host name or IP address of your ISP'#39's DNS server' ParentShowHint = False ShowHint = True - TabOrder = 4 + TabOrder = 6 end object TcpDnsCheckBox: TCheckBox Left = 250 @@ -435,7 +463,7 @@ object MailCfgDlg: TMailCfgDlg Caption = 'TCP' ParentShowHint = False ShowHint = True - TabOrder = 5 + TabOrder = 7 end object RelayRadioButton: TRadioButton Left = 169 @@ -446,7 +474,7 @@ object MailCfgDlg: TMailCfgDlg Caption = 'Use Relay Server' ParentShowHint = False ShowHint = True - TabOrder = 6 + TabOrder = 5 OnClick = DNSRadioButtonClick end object DeliveryAttemptsEdit: TEdit @@ -489,7 +517,7 @@ object MailCfgDlg: TMailCfgDlg Hint = 'Character set specified for locally generated e-mail messages' ParentShowHint = False ShowHint = True - TabOrder = 7 + TabOrder = 3 end end object RelayTabSheet: TTabSheet @@ -732,7 +760,7 @@ object MailCfgDlg: TMailCfgDlg Caption = 'Mail from Blacklisted Servers:' ParentShowHint = False ShowHint = True - TabOrder = 1 + TabOrder = 3 object BLSubjectLabel: TLabel Left = 16 Top = 92 @@ -821,19 +849,19 @@ object MailCfgDlg: TMailCfgDlg Top = 9 Width = 113 Height = 25 - Hint = 'Blacklist Exempted IP addresses' - Caption = 'Exempt IPs' - TabOrder = 2 + Hint = 'Blacklist Exempted IPs, hostnames, and e-mail addresses' + Caption = 'Exemptions' + TabOrder = 1 OnClick = DNSBLExemptionsButtonClick end - object BLDebugCheckBox: TCheckBox + object DNSBLSpamHashCheckBox: TCheckBox Left = 256 Top = 9 Width = 73 Height = 25 - Hint = 'Enable debug logging of DNSBL lookups' - Caption = 'Debug' - TabOrder = 3 + Hint = 'Store hashes of messages from blacklisted servers in SPAM base ' + Caption = 'Hash' + TabOrder = 2 end end object AdvancedTabSheet: TTabSheet @@ -849,8 +877,10 @@ object MailCfgDlg: TMailCfgDlg 'SendMail: Ignore '#39'in transit'#39' attribute' 'Retain received mail files (in temp directory)' 'Allow receipt of mail by user number' + 'Allow receipt of mail to '#39'sysop'#39' and '#39'postmaster'#39 'Check '#39'Received'#39' header fields against DNSBL' - 'Throttle DNS blacklisted server sessions') + 'Throttle DNS blacklisted server sessions' + 'Auto-exempt sent-mail recipients from DNSBL') TabOrder = 0 end end