X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FfrmInvalidSSLCertificate.cpp;h=f3b4de1f1b48ca84c51088ff394ecb44423bf1fe;hp=ce1f8f47440670e8e083984c85a86608e89778e3;hb=56eff3f03cf38a27161b3279318c474e0421111c;hpb=4df7ad411323551899262cad3a5ef0e86f27e2a1 diff --git a/source/frmInvalidSSLCertificate.cpp b/source/frmInvalidSSLCertificate.cpp index ce1f8f4..f3b4de1 100644 --- a/source/frmInvalidSSLCertificate.cpp +++ b/source/frmInvalidSSLCertificate.cpp @@ -1,3 +1,21 @@ +// frmInvalidSSLCertificate.cpp - Invalid SSL Certificate form. +// +// (c) 2012-2015 Xestia Software Development. +// +// This file is part of Xestia Address Book. +// +// Xestia Address Book is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by the +// Free Software Foundation, version 3 of the license. +// +// Xestia Address Book is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with Xestia Address Book. If not, see + #include "frmInvalidSSLCertificate.h" #include "frmSSLCertificate.h" @@ -10,40 +28,78 @@ frmInvalidSSLCertificateADT( parent ) void frmInvalidSSLCertificate::Accept( wxCommandEvent& event ) { + + // Button 'Accept' was pressed. + intResult = 1; Close(); + } void frmInvalidSSLCertificate::Reject( wxCommandEvent& event ) { + + // Button 'Reject' was pressed. + intResult = 2; Close(); + } void frmInvalidSSLCertificate::ViewCertificates( wxCommandEvent& event ) { + + // Button 'View Certificates' was pressed. + frmSSLCertificate *frameSSLCert = new frmSSLCertificate ( this ); frameSSLCert->StartCertFrom(0); - frameSSLCert->SetupCerts(CertData); + frameSSLCert->SetupCertsString(CertDataString); frameSSLCert->ShowModal(); delete frameSSLCert; frameSSLCert = NULL; + } void frmInvalidSSLCertificate::LoadData(SSLCertCollection CertDataInc, wxString AccountNameInc) { + // Load the invalid SSL certificate dialog. + AccountName = AccountNameInc; CertData = CertDataInc; - lblSSLText->SetLabel(wxT("An invalid SSL certificate was received from the server for the '") + AccountName + wxT("' account.\n\n") + - wxT("Click on one of the following buttons:\n\n") + - wxT("- Accept to accept the SSL certificate for this session and future sessions until the certificate changes.\n") + - wxT("- Reject to not use this certificate and disconnect (you will be asked again on subsequent reconnections to the server).\n") + - wxT("- View Certificates to review the certificates that were received.") - ); + wxString SSLTextLabel; + + SSLTextLabel.Append(wxString::Format(_("An invalid SSL certificate was received from the server for the '%s' account.\n\n"), AccountName)); + SSLTextLabel.Append(_("Click on one of the following buttons:\n\n")); + SSLTextLabel.Append(_("- Accept to accept the SSL certificate for this session and future sessions until the certificate changes.\n")); + SSLTextLabel.Append(_("- Reject to not use this certificate and disconnect (you will be asked again on subsequent reconnections to the server).\n")); + SSLTextLabel.Append(_("- View Certificates to review the certificates that were received.")); + + lblSSLText->SetLabel(SSLTextLabel); + +} + +void frmInvalidSSLCertificate::LoadData(SSLCertCollectionString CertDataInc, + wxString AccountNameInc) +{ + + // Load the invalid SSL certificate dialog. + + AccountName = AccountNameInc; + CertDataString = CertDataInc; + + wxString SSLTextLabel; + + SSLTextLabel.Append(wxString::Format(_("An invalid SSL certificate was received from the server for the '%s' account.\n\n"), AccountName)); + SSLTextLabel.Append(_("Click on one of the following buttons:\n\n")); + SSLTextLabel.Append(_("- Accept to accept the SSL certificate for this session and future sessions until the certificate changes.\n")); + SSLTextLabel.Append(_("- Reject to not use this certificate and disconnect (you will be asked again on subsequent reconnections to the server).\n")); + SSLTextLabel.Append(_("- View Certificates to review the certificates that were received.")); + + lblSSLText->SetLabel(SSLTextLabel); } @@ -51,21 +107,49 @@ void frmInvalidSSLCertificate::LoadDataNew(SSLCertCollection CertDataInc, wxString DomainNameInc) { + // Load the invalid SSL certificate dialog for a new account. + AccountName = DomainNameInc; CertData = CertDataInc; + + wxString SSLTextLabel; + + SSLTextLabel.Append(wxString::Format(_("An invalid SSL certificate was received from the server for the '%s' account.\n\n"), AccountName)); + SSLTextLabel.Append(_("Click on one of the following buttons:\n\n")); + SSLTextLabel.Append(_("- Accept to accept the SSL certificate for this session and future sessions until the certificate changes.\n")); + SSLTextLabel.Append(_("- Reject to not use this certificate and disconnect.\n")); + SSLTextLabel.Append(_("- View Certificates to review the certificates that were received.")); + + lblSSLText->SetLabel(SSLTextLabel); + +} - lblSSLText->SetLabel(wxT("An invalid SSL certificate was received from the server ") + AccountName + (" account.\n\n") + - wxT("Click on one of the following buttons:\n\n") + - wxT("- Accept to accept the SSL certificate for this session and future sessions until the certificate changes.\n") + - wxT("- Reject to not use this certificate and disconnect.\n") + - wxT("- View Certificates to review the certificates that were received.") - ); +void frmInvalidSSLCertificate::LoadDataNew(SSLCertCollectionString CertDataInc, + std::string DomainNameInc) +{ + // Load the invalid SSL certificate dialog for a new account. + + AccountName = DomainNameInc; + CertDataString = CertDataInc; + + wxString SSLTextLabel; + + SSLTextLabel.Append(wxString::Format(_("An invalid SSL certificate was received from the server for the '%s' account.\n\n"), AccountName)); + SSLTextLabel.Append(_("Click on one of the following buttons:\n\n")); + SSLTextLabel.Append(_("- Accept to accept the SSL certificate for this session and future sessions until the certificate changes.\n")); + SSLTextLabel.Append(_("- Reject to not use this certificate and disconnect.\n")); + SSLTextLabel.Append(_("- View Certificates to review the certificates that were received.")); + + lblSSLText->SetLabel(SSLTextLabel); + } int frmInvalidSSLCertificate::GetResult() { + // Get the result of which button was pressed in the dialog. + return intResult; } \ No newline at end of file