Skip to content
Snippets Groups Projects
Commit 30f257a6 authored by rswindell's avatar rswindell
Browse files

Added missing configuration parameters:

- Max Msgs Waiting per user (does not apply to W-exempt users)
- Connect Timeout (for sendmail outbound connections)
Allow these parameters to be set to 0 (N/A):
- Max Recipients (0=unlimited)
- Lines Per Yield (0=no yielding)
parent 3c357490
No related branches found
No related tags found
No related merge requests found
......@@ -6,7 +6,7 @@
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
* *
* Copyright 2009 Rob Swindell - http://www.synchro.net/copyright.html *
* Copyright 2014 Rob Swindell - http://www.synchro.net/copyright.html *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
......@@ -88,9 +88,22 @@ void __fastcall TMailCfgDlg::FormShow(TObject *Sender)
}
MaxClientsEdit->Text=AnsiString(MainForm->mail_startup.max_clients);
MaxInactivityEdit->Text=AnsiString(MainForm->mail_startup.max_inactivity);
MaxRecipientsEdit->Text=AnsiString(MainForm->mail_startup.max_recipients);
MaxMsgSizeEdit->Text=AnsiString(MainForm->mail_startup.max_msg_size);
LinesPerYieldEdit->Text=AnsiString(MainForm->mail_startup.lines_per_yield);
if(MainForm->mail_startup.max_recipients == 0)
MaxRecipientsEdit->Text="N/A";
else
MaxRecipientsEdit->Text=AnsiString(MainForm->mail_startup.max_recipients);
if(MainForm->mail_startup.max_msg_size == 0)
MaxMsgSizeEdit->Text="N/A";
else
MaxMsgSizeEdit->Text=AnsiString(MainForm->mail_startup.max_msg_size);
if(MainForm->mail_startup.max_msgs_waiting == 0)
MaxMsgsWaitingEdit->Text="N/A";
else
MaxMsgsWaitingEdit->Text=AnsiString(MainForm->mail_startup.max_msgs_waiting);
if(MainForm->mail_startup.lines_per_yield == 0)
LinesPerYieldEdit->Text="N/A";
else
LinesPerYieldEdit->Text=AnsiString(MainForm->mail_startup.lines_per_yield);
AutoStartCheckBox->Checked=MainForm->MailAutoStart;
LogFileCheckBox->Checked=MainForm->MailLogFile;
......@@ -110,6 +123,7 @@ void __fastcall TMailCfgDlg::FormShow(TObject *Sender)
DNSServerEdit->Text=AnsiString(MainForm->mail_startup.dns_server);
else
DNSServerEdit->Text="<auto>";
ConnectTimeoutEdit->Text=AnsiString(MainForm->mail_startup.connect_timeout);
InboundSoundEdit->Text=AnsiString(MainForm->mail_startup.inbound_sound);
OutboundSoundEdit->Text=AnsiString(MainForm->mail_startup.outbound_sound);
POP3SoundEdit->Text=AnsiString(MainForm->mail_startup.pop3_sound);
......@@ -229,13 +243,15 @@ void __fastcall TMailCfgDlg::OKBtnClick(TObject *Sender)
MainForm->mail_startup.relay_port=RelayPortEdit->Text.ToIntDef(IPPORT_SMTP);
MainForm->mail_startup.max_clients=MaxClientsEdit->Text.ToIntDef(10);
MainForm->mail_startup.max_inactivity=MaxInactivityEdit->Text.ToIntDef(120);
MainForm->mail_startup.max_recipients=MaxRecipientsEdit->Text.ToIntDef(100);
MainForm->mail_startup.max_recipients=MaxRecipientsEdit->Text.ToIntDef(0);
MainForm->mail_startup.max_msg_size
=MaxMsgSizeEdit->Text.ToIntDef(MainForm->mail_startup.max_msg_size);
MainForm->mail_startup.max_msgs_waiting
=MaxMsgsWaitingEdit->Text.ToIntDef(0);
MainForm->mail_startup.max_delivery_attempts
=DeliveryAttemptsEdit->Text.ToIntDef(10);
MainForm->mail_startup.rescan_frequency=RescanFreqEdit->Text.ToIntDef(300);
MainForm->mail_startup.lines_per_yield=LinesPerYieldEdit->Text.ToIntDef(10);
MainForm->mail_startup.lines_per_yield=LinesPerYieldEdit->Text.ToIntDef(0);
SAFECOPY(MainForm->mail_startup.default_charset
,DefCharsetEdit->Text.c_str());
......@@ -246,6 +262,7 @@ void __fastcall TMailCfgDlg::OKBtnClick(TObject *Sender)
,DNSServerEdit->Text.c_str());
else
MainForm->mail_startup.dns_server[0]=0;
MainForm->mail_startup.connect_timeout=ConnectTimeoutEdit->Text.ToIntDef(0);
SAFECOPY(MainForm->mail_startup.relay_server
,RelayServerEdit->Text.c_str());
SAFECOPY(MainForm->mail_startup.relay_user
......@@ -421,6 +438,8 @@ void __fastcall TMailCfgDlg::SendMailCheckBoxClick(TObject *Sender)
OutboundSoundButton->Enabled=checked;
DefCharsetLabel->Enabled=checked;
DefCharsetEdit->Enabled=checked;
ConnectTimeoutLabel->Enabled=checked;
ConnectTimeoutEdit->Enabled=checked;
DNSRadioButtonClick(Sender);
}
......
This diff is collapsed.
......@@ -147,6 +147,10 @@ __published:
TEdit *SubPortEdit;
TCheckBox *DebugHeadersCheckBox;
TCheckBox *UseSubPortCheckBox;
TLabel *MaxMsgsLabel;
TEdit *MaxMsgsWaitingEdit;
TLabel *ConnectTimeoutLabel;
TEdit *ConnectTimeoutEdit;
void __fastcall InboundSoundButtonClick(TObject *Sender);
void __fastcall OutboundSoundButtonClick(TObject *Sender);
void __fastcall FormShow(TObject *Sender);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment