Skip to content
Snippets Groups Projects
Commit 0b148b0e authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Use human readable durations (e.g. 1h instead of 3600) in edit boxes

... for server configuration dialogs
parent 7e9a4f86
No related branches found
No related tags found
No related merge requests found
Pipeline #5066 passed
...@@ -60,8 +60,8 @@ void __fastcall TFtpCfgDlg::FormShow(TObject *Sender) ...@@ -60,8 +60,8 @@ void __fastcall TFtpCfgDlg::FormShow(TObject *Sender)
} }
MaxClientsEdit->Text=AnsiString((int)MainForm->ftp_startup.max_clients); MaxClientsEdit->Text=AnsiString((int)MainForm->ftp_startup.max_clients);
MaxInactivityEdit->Text=AnsiString((int)MainForm->ftp_startup.max_inactivity); MaxInactivityEdit->Text = duration_to_str(MainForm->ftp_startup.max_inactivity, str, sizeof str);
QwkTimeoutEdit->Text=AnsiString((int)MainForm->ftp_startup.qwk_timeout); QwkTimeoutEdit->Text = duration_to_str(MainForm->ftp_startup.qwk_timeout, str, sizeof str);
PortEdit->Text=AnsiString((int)MainForm->ftp_startup.port); PortEdit->Text=AnsiString((int)MainForm->ftp_startup.port);
AutoStartCheckBox->Checked=MainForm->FtpAutoStart; AutoStartCheckBox->Checked=MainForm->FtpAutoStart;
LogFileCheckBox->Checked=MainForm->FtpLogFile; LogFileCheckBox->Checked=MainForm->FtpLogFile;
...@@ -119,8 +119,8 @@ void __fastcall TFtpCfgDlg::OKBtnClick(TObject *Sender) ...@@ -119,8 +119,8 @@ void __fastcall TFtpCfgDlg::OKBtnClick(TObject *Sender)
MainForm->ftp_startup.pasv_ip_addr.s_addr=0; MainForm->ftp_startup.pasv_ip_addr.s_addr=0;
MainForm->ftp_startup.max_clients=MaxClientsEdit->Text.ToIntDef(FTP_DEFAULT_MAX_CLIENTS); MainForm->ftp_startup.max_clients=MaxClientsEdit->Text.ToIntDef(FTP_DEFAULT_MAX_CLIENTS);
MainForm->ftp_startup.max_inactivity=MaxInactivityEdit->Text.ToIntDef(FTP_DEFAULT_MAX_INACTIVITY); MainForm->ftp_startup.max_inactivity = parse_duration(MaxInactivityEdit->Text.c_str());
MainForm->ftp_startup.qwk_timeout=QwkTimeoutEdit->Text.ToIntDef(FTP_DEFAULT_QWK_TIMEOUT); MainForm->ftp_startup.qwk_timeout = parse_duration(QwkTimeoutEdit->Text.c_str());
MainForm->ftp_startup.port=PortEdit->Text.ToIntDef(IPPORT_FTP); MainForm->ftp_startup.port=PortEdit->Text.ToIntDef(IPPORT_FTP);
MainForm->ftp_startup.max_concurrent_connections = MaxConConEdit->Text.ToIntDef(0); MainForm->ftp_startup.max_concurrent_connections = MaxConConEdit->Text.ToIntDef(0);
MainForm->FtpAutoStart=AutoStartCheckBox->Checked; MainForm->FtpAutoStart=AutoStartCheckBox->Checked;
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "MailCfgDlgUnit.h" #include "MailCfgDlgUnit.h"
#include "TextFileEditUnit.h" #include "TextFileEditUnit.h"
#include "SoundCfgDlgUnit.h" #include "SoundCfgDlgUnit.h"
#include "genwrap.h"
#include <stdio.h> // sprintf() #include <stdio.h> // sprintf()
#include <mmsystem.h> // sndPlaySound() #include <mmsystem.h> // sndPlaySound()
//--------------------------------------------------------------------- //---------------------------------------------------------------------
...@@ -69,7 +70,7 @@ void __fastcall TMailCfgDlg::FormShow(TObject *Sender) ...@@ -69,7 +70,7 @@ void __fastcall TMailCfgDlg::FormShow(TObject *Sender)
NetworkInterfaceEdit->Text=AnsiString(str); NetworkInterfaceEdit->Text=AnsiString(str);
} }
MaxClientsEdit->Text=AnsiString(MainForm->mail_startup.max_clients); MaxClientsEdit->Text=AnsiString(MainForm->mail_startup.max_clients);
MaxInactivityEdit->Text=AnsiString(MainForm->mail_startup.max_inactivity); MaxInactivityEdit->Text=duration_to_str(MainForm->mail_startup.max_inactivity, str, sizeof str);
if(MainForm->mail_startup.max_recipients == 0) if(MainForm->mail_startup.max_recipients == 0)
MaxRecipientsEdit->Text="N/A"; MaxRecipientsEdit->Text="N/A";
else else
...@@ -107,13 +108,13 @@ void __fastcall TMailCfgDlg::FormShow(TObject *Sender) ...@@ -107,13 +108,13 @@ void __fastcall TMailCfgDlg::FormShow(TObject *Sender)
DNSServerEdit->Text=AnsiString(MainForm->mail_startup.dns_server); DNSServerEdit->Text=AnsiString(MainForm->mail_startup.dns_server);
else else
DNSServerEdit->Text="<auto>"; DNSServerEdit->Text="<auto>";
ConnectTimeoutEdit->Text=AnsiString(MainForm->mail_startup.connect_timeout); ConnectTimeoutEdit->Text = duration_to_str(MainForm->mail_startup.connect_timeout, str, sizeof str);
InboundSoundEdit->Text=AnsiString(MainForm->mail_startup.inbound_sound); InboundSoundEdit->Text=AnsiString(MainForm->mail_startup.inbound_sound);
OutboundSoundEdit->Text=AnsiString(MainForm->mail_startup.outbound_sound); OutboundSoundEdit->Text=AnsiString(MainForm->mail_startup.outbound_sound);
POP3SoundEdit->Text=AnsiString(MainForm->mail_startup.pop3_sound); POP3SoundEdit->Text=AnsiString(MainForm->mail_startup.pop3_sound);
DeliveryAttemptsEdit->Text DeliveryAttemptsEdit->Text
=AnsiString(MainForm->mail_startup.max_delivery_attempts); =AnsiString(MainForm->mail_startup.max_delivery_attempts);
RescanFreqEdit->Text=AnsiString(MainForm->mail_startup.rescan_frequency); RescanFreqEdit->Text = duration_to_str(MainForm->mail_startup.rescan_frequency, str, sizeof str);
DefaultUserEdit->Text=AnsiString(MainForm->mail_startup.default_user); DefaultUserEdit->Text=AnsiString(MainForm->mail_startup.default_user);
BLSubjectEdit->Text=AnsiString(MainForm->mail_startup.dnsbl_tag); BLSubjectEdit->Text=AnsiString(MainForm->mail_startup.dnsbl_tag);
BLHeaderEdit->Text=AnsiString(MainForm->mail_startup.dnsbl_hdr); BLHeaderEdit->Text=AnsiString(MainForm->mail_startup.dnsbl_hdr);
...@@ -214,12 +215,12 @@ void __fastcall TMailCfgDlg::OKBtnClick(TObject *Sender) ...@@ -214,12 +215,12 @@ void __fastcall TMailCfgDlg::OKBtnClick(TObject *Sender)
MainForm->mail_startup.pop3s_port=TLSPOP3PortEdit->Text.ToIntDef(IPPORT_POP3S); MainForm->mail_startup.pop3s_port=TLSPOP3PortEdit->Text.ToIntDef(IPPORT_POP3S);
MainForm->mail_startup.relay_port=RelayPortEdit->Text.ToIntDef(IPPORT_SMTP); MainForm->mail_startup.relay_port=RelayPortEdit->Text.ToIntDef(IPPORT_SMTP);
MainForm->mail_startup.max_clients=MaxClientsEdit->Text.ToIntDef(MAIL_DEFAULT_MAX_CLIENTS); MainForm->mail_startup.max_clients=MaxClientsEdit->Text.ToIntDef(MAIL_DEFAULT_MAX_CLIENTS);
MainForm->mail_startup.max_inactivity=MaxInactivityEdit->Text.ToIntDef(MAIL_DEFAULT_MAX_INACTIVITY); MainForm->mail_startup.max_inactivity=parse_duration(MaxInactivityEdit->Text.c_str());
MainForm->mail_startup.max_recipients=MaxRecipientsEdit->Text.ToIntDef(MAIL_DEFAULT_MAX_RECIPIENTS); MainForm->mail_startup.max_recipients=MaxRecipientsEdit->Text.ToIntDef(MAIL_DEFAULT_MAX_RECIPIENTS);
MainForm->mail_startup.max_msg_size=parse_byte_count(MaxMsgSizeEdit->Text.c_str(), 1); MainForm->mail_startup.max_msg_size=parse_byte_count(MaxMsgSizeEdit->Text.c_str(), 1);
MainForm->mail_startup.max_msgs_waiting=MaxMsgsWaitingEdit->Text.ToIntDef(0); MainForm->mail_startup.max_msgs_waiting=MaxMsgsWaitingEdit->Text.ToIntDef(0);
MainForm->mail_startup.max_delivery_attempts=DeliveryAttemptsEdit->Text.ToIntDef(MAIL_DEFAULT_MAX_DELIVERY_ATTEMPTS); MainForm->mail_startup.max_delivery_attempts=DeliveryAttemptsEdit->Text.ToIntDef(MAIL_DEFAULT_MAX_DELIVERY_ATTEMPTS);
MainForm->mail_startup.rescan_frequency=RescanFreqEdit->Text.ToIntDef(MAIL_DEFAULT_RESCAN_FREQUENCY); MainForm->mail_startup.rescan_frequency = parse_duration(RescanFreqEdit->Text.c_str());
MainForm->mail_startup.max_concurrent_connections=MaxConConEdit->Text.ToIntDef(0); MainForm->mail_startup.max_concurrent_connections=MaxConConEdit->Text.ToIntDef(0);
SAFECOPY(MainForm->mail_startup.default_user SAFECOPY(MainForm->mail_startup.default_user
...@@ -229,7 +230,7 @@ void __fastcall TMailCfgDlg::OKBtnClick(TObject *Sender) ...@@ -229,7 +230,7 @@ void __fastcall TMailCfgDlg::OKBtnClick(TObject *Sender)
,DNSServerEdit->Text.c_str()); ,DNSServerEdit->Text.c_str());
else else
MainForm->mail_startup.dns_server[0]=0; MainForm->mail_startup.dns_server[0]=0;
MainForm->mail_startup.connect_timeout=ConnectTimeoutEdit->Text.ToIntDef(0); MainForm->mail_startup.connect_timeout = parse_duration(ConnectTimeoutEdit->Text.c_str());
SAFECOPY(MainForm->mail_startup.relay_server SAFECOPY(MainForm->mail_startup.relay_server
,RelayServerEdit->Text.c_str()); ,RelayServerEdit->Text.c_str());
SAFECOPY(MainForm->mail_startup.relay_user SAFECOPY(MainForm->mail_startup.relay_user
......
...@@ -76,7 +76,7 @@ void __fastcall TTelnetCfgDlg::FormShow(TObject *Sender) ...@@ -76,7 +76,7 @@ void __fastcall TTelnetCfgDlg::FormShow(TObject *Sender)
strListCombine(MainForm->bbs_startup.ssh_interfaces, str, sizeof(str)-1, ","); strListCombine(MainForm->bbs_startup.ssh_interfaces, str, sizeof(str)-1, ",");
SshInterfaceEdit->Text=AnsiString(str); SshInterfaceEdit->Text=AnsiString(str);
} }
SshConnTimeoutEdit->Text=AnsiString((int)MainForm->bbs_startup.ssh_connect_timeout); SshConnTimeoutEdit->Text = duration_to_str(MainForm->bbs_startup.ssh_connect_timeout, str, sizeof str);
TelnetPortEdit->Text=AnsiString((int)MainForm->bbs_startup.telnet_port); TelnetPortEdit->Text=AnsiString((int)MainForm->bbs_startup.telnet_port);
RLoginPortEdit->Text=AnsiString((int)MainForm->bbs_startup.rlogin_port); RLoginPortEdit->Text=AnsiString((int)MainForm->bbs_startup.rlogin_port);
...@@ -127,7 +127,7 @@ void __fastcall TTelnetCfgDlg::OKBtnClick(TObject *Sender) ...@@ -127,7 +127,7 @@ void __fastcall TTelnetCfgDlg::OKBtnClick(TObject *Sender)
iniFreeStringList(MainForm->bbs_startup.ssh_interfaces); iniFreeStringList(MainForm->bbs_startup.ssh_interfaces);
MainForm->bbs_startup.ssh_interfaces = strListSplitCopy(NULL, SshInterfaceEdit->Text.c_str(), ","); MainForm->bbs_startup.ssh_interfaces = strListSplitCopy(NULL, SshInterfaceEdit->Text.c_str(), ",");
MainForm->bbs_startup.ssh_connect_timeout=SshConnTimeoutEdit->Text.ToIntDef(0); MainForm->bbs_startup.ssh_connect_timeout = parse_duration(SshConnTimeoutEdit->Text.c_str());
MainForm->bbs_startup.telnet_port=TelnetPortEdit->Text.ToIntDef(23); MainForm->bbs_startup.telnet_port=TelnetPortEdit->Text.ToIntDef(23);
MainForm->bbs_startup.rlogin_port=RLoginPortEdit->Text.ToIntDef(513); MainForm->bbs_startup.rlogin_port=RLoginPortEdit->Text.ToIntDef(513);
......
...@@ -74,7 +74,7 @@ void __fastcall TWebCfgDlg::FormShow(TObject *Sender) ...@@ -74,7 +74,7 @@ void __fastcall TWebCfgDlg::FormShow(TObject *Sender)
MaxClientsEdit->Text="infinite"; MaxClientsEdit->Text="infinite";
else else
MaxClientsEdit->Text=AnsiString((int)MainForm->web_startup.max_clients); MaxClientsEdit->Text=AnsiString((int)MainForm->web_startup.max_clients);
MaxInactivityEdit->Text=AnsiString((int)MainForm->web_startup.max_inactivity); MaxInactivityEdit->Text = duration_to_str(MainForm->web_startup.max_inactivity, str, sizeof str);
PortEdit->Text=AnsiString((int)MainForm->web_startup.port); PortEdit->Text=AnsiString((int)MainForm->web_startup.port);
TlsPortEdit->Text=AnsiString((int)MainForm->web_startup.tls_port); TlsPortEdit->Text=AnsiString((int)MainForm->web_startup.tls_port);
AutoStartCheckBox->Checked=MainForm->WebAutoStart; AutoStartCheckBox->Checked=MainForm->WebAutoStart;
...@@ -94,7 +94,7 @@ void __fastcall TWebCfgDlg::FormShow(TObject *Sender) ...@@ -94,7 +94,7 @@ void __fastcall TWebCfgDlg::FormShow(TObject *Sender)
ServerSideJsExtEdit->Text=AnsiString(MainForm->web_startup.ssjs_ext); ServerSideJsExtEdit->Text=AnsiString(MainForm->web_startup.ssjs_ext);
CGIContentEdit->Text=AnsiString(MainForm->web_startup.default_cgi_content); CGIContentEdit->Text=AnsiString(MainForm->web_startup.default_cgi_content);
CGIMaxInactivityEdit->Text=AnsiString((int)MainForm->web_startup.max_cgi_inactivity); CGIMaxInactivityEdit->Text = duration_to_str(MainForm->web_startup.max_cgi_inactivity, str, sizeof str);
strListCombine(MainForm->web_startup.index_file_name, str, sizeof(str)-1, ","); strListCombine(MainForm->web_startup.index_file_name, str, sizeof(str)-1, ",");
IndexFileEdit->Text=AnsiString(str); IndexFileEdit->Text=AnsiString(str);
...@@ -127,7 +127,7 @@ void __fastcall TWebCfgDlg::OKBtnClick(TObject *Sender) ...@@ -127,7 +127,7 @@ void __fastcall TWebCfgDlg::OKBtnClick(TObject *Sender)
iniFreeStringList(MainForm->web_startup.tls_interfaces); iniFreeStringList(MainForm->web_startup.tls_interfaces);
MainForm->web_startup.tls_interfaces = strListSplitCopy(NULL, TlsInterfaceEdit->Text.c_str(), ","); MainForm->web_startup.tls_interfaces = strListSplitCopy(NULL, TlsInterfaceEdit->Text.c_str(), ",");
MainForm->web_startup.max_clients=MaxClientsEdit->Text.ToIntDef(10); MainForm->web_startup.max_clients=MaxClientsEdit->Text.ToIntDef(10);
MainForm->web_startup.max_inactivity=MaxInactivityEdit->Text.ToIntDef(WEB_DEFAULT_MAX_INACTIVITY); MainForm->web_startup.max_inactivity = parse_duration(MaxInactivityEdit->Text.c_str());
MainForm->web_startup.port=PortEdit->Text.ToIntDef(IPPORT_HTTP); MainForm->web_startup.port=PortEdit->Text.ToIntDef(IPPORT_HTTP);
MainForm->web_startup.tls_port=TlsPortEdit->Text.ToIntDef(IPPORT_HTTPS); MainForm->web_startup.tls_port=TlsPortEdit->Text.ToIntDef(IPPORT_HTTPS);
MainForm->WebAutoStart=AutoStartCheckBox->Checked; MainForm->WebAutoStart=AutoStartCheckBox->Checked;
...@@ -154,7 +154,7 @@ void __fastcall TWebCfgDlg::OKBtnClick(TObject *Sender) ...@@ -154,7 +154,7 @@ void __fastcall TWebCfgDlg::OKBtnClick(TObject *Sender)
SAFECOPY(MainForm->web_startup.default_cgi_content SAFECOPY(MainForm->web_startup.default_cgi_content
,CGIContentEdit->Text.c_str()); ,CGIContentEdit->Text.c_str());
MainForm->web_startup.max_cgi_inactivity MainForm->web_startup.max_cgi_inactivity
=CGIMaxInactivityEdit->Text.ToIntDef(WEB_DEFAULT_MAX_CGI_INACTIVITY); = parse_duration(CGIMaxInactivityEdit->Text.c_str());
strListFree(&MainForm->web_startup.index_file_name); strListFree(&MainForm->web_startup.index_file_name);
strListSplitCopy(&MainForm->web_startup.index_file_name, strListSplitCopy(&MainForm->web_startup.index_file_name,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment