X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FfrmInvalidSSLCertificate.cpp;h=f3b4de1f1b48ca84c51088ff394ecb44423bf1fe;hp=893780243bfa12d9a188ca3dd574c120a2a039f5;hb=f69e09d827e06435ea94bb73aa71ab5f9d5c035b;hpb=53733f60f6c76e040717f355ef85377f69fd50ed

diff --git a/source/frmInvalidSSLCertificate.cpp b/source/frmInvalidSSLCertificate.cpp
index 8937802..f3b4de1 100644
--- a/source/frmInvalidSSLCertificate.cpp
+++ b/source/frmInvalidSSLCertificate.cpp
@@ -53,7 +53,7 @@ void frmInvalidSSLCertificate::ViewCertificates( wxCommandEvent& event )
 	
 	frmSSLCertificate *frameSSLCert = new frmSSLCertificate ( this );
 	frameSSLCert->StartCertFrom(0);
-	frameSSLCert->SetupCerts(CertData);
+	frameSSLCert->SetupCertsString(CertDataString);
 	frameSSLCert->ShowModal();
 		
 	delete frameSSLCert;
@@ -82,6 +82,27 @@ void frmInvalidSSLCertificate::LoadData(SSLCertCollection CertDataInc,
 
 }
 
+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);
+
+}
+
 void frmInvalidSSLCertificate::LoadDataNew(SSLCertCollection CertDataInc, 
 					wxString DomainNameInc)
 {
@@ -103,6 +124,27 @@ void frmInvalidSSLCertificate::LoadDataNew(SSLCertCollection CertDataInc,
 	
 }
 
+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()
 {