X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Factmgr%2FfrmActivityMgr.cpp;h=7232694151bba19869ab247dc4e13272cd07fa7e;hp=a066d8fe1878358f368c8585c659db8b9162a5a5;hb=547ab1fe605cdb4884179ab011dabba4d0bd7bc2;hpb=a578ed436123242f807cb59eae02fcf6c22e2458

diff --git a/source/actmgr/frmActivityMgr.cpp b/source/actmgr/frmActivityMgr.cpp
index a066d8f..7232694 100644
--- a/source/actmgr/frmActivityMgr.cpp
+++ b/source/actmgr/frmActivityMgr.cpp
@@ -331,6 +331,32 @@ void frmActivityMgr::ProcessTasksThread()
 							
 #if defined(__APPLE__)
 #elif defined(__WIN32__)
+
+							ConnObjectIter->second->BypassSSLVerification(true);
+
+							COConnectResult ConnectionSSLResult = ConnObjectIter->second->Connect(false);
+
+							ConnObjectIter->second->BypassSSLVerification(false);
+
+							BOOL ModifiedCertificateData = false;
+							CRYPTUI_VIEWCERTIFICATE_STRUCTW CertificateData = BuildCertificateData(ConnObjectIter->second, (HWND)frmMainPtrGet->GetHandle());
+
+							if (!CryptUIDlgViewCertificate(&CertificateData, &ModifiedCertificateData)) {
+								wxMessageBox(_("An error occured while trying to open the certificate dialog."), _("Error opening Certificate Information dialog"));
+							}
+
+							if (ModifiedCertificateData == false) {
+
+								frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnObjectIter->second->BuildSSLCollection());
+								iter->second = 2;
+								break;
+
+							} else {
+
+								frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnObjectIter->second->BuildSSLCollection());
+
+							}
+
 #else
 	
 							bool UsingSSLBypass = false;
@@ -528,6 +554,32 @@ void frmActivityMgr::ProcessTasksThread()
 							
 #if defined(__APPLE__)
 #elif defined(__WIN32__)
+
+							ConnObjectIter->second->BypassSSLVerification(true);
+
+							COConnectResult ConnectionSSLResult = ConnObjectIter->second->Connect(false);
+
+							ConnObjectIter->second->BypassSSLVerification(false);
+
+							BOOL ModifiedCertificateData = false;
+							CRYPTUI_VIEWCERTIFICATE_STRUCTW CertificateData = BuildCertificateData(ConnObjectIter->second, (HWND)frmMainPtrGet->GetHandle());
+
+							if (!CryptUIDlgViewCertificate(&CertificateData, &ModifiedCertificateData)) {
+								wxMessageBox(_("An error occured while trying to open the certificate dialog."), _("Error opening Certificate Information dialog"));
+							}
+
+							if (ModifiedCertificateData == FALSE) {
+
+								frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnObjectIter->second->BuildSSLCollection());
+								iter->second = 2;
+								break;
+
+							} else {
+
+								frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnObjectIter->second->BuildSSLCollection());
+
+							}
+
 #else
 	
 							bool UsingSSLBypass = false;
@@ -796,6 +848,32 @@ void frmActivityMgr::ProcessTasksThread()
 							
 #if defined(__APPLE__)
 #elif defined(__WIN32__)
+
+							ConnObjectIter->second->BypassSSLVerification(true);
+
+							COConnectResult ConnectionSSLResult = ConnObjectIter->second->Connect(false);
+
+							ConnObjectIter->second->BypassSSLVerification(false);
+
+							BOOL ModifiedCertificateData = false;
+							CRYPTUI_VIEWCERTIFICATE_STRUCTW CertificateData = BuildCertificateData(ConnObjectIter->second, (HWND)frmMainPtrGet->GetHandle());
+
+							if (!CryptUIDlgViewCertificate(&CertificateData, &ModifiedCertificateData)) {
+								wxMessageBox(_("An error occured while trying to open the certificate dialog."), _("Error opening Certificate Information dialog"));
+							}
+
+							if (ModifiedCertificateData == false) {
+
+								frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnObjectIter->second->BuildSSLCollection());
+								iter->second = 2;
+								break;
+
+							} else {
+
+								frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnObjectIter->second->BuildSSLCollection());
+
+							}
+
 #else
 	
 							bool UsingSSLBypass = false;
@@ -1025,6 +1103,32 @@ void frmActivityMgr::ProcessTasksThread()
 							
 #if defined(__APPLE__)
 #elif defined(__WIN32__)
+
+							ConnObjectIter->second->BypassSSLVerification(true);
+
+							COConnectResult ConnectionSSLResult = ConnObjectIter->second->Connect(false);
+
+							ConnObjectIter->second->BypassSSLVerification(false);
+
+							BOOL ModifiedCertificateData = false;
+							CRYPTUI_VIEWCERTIFICATE_STRUCTW CertificateData = BuildCertificateData(ConnObjectIter->second, (HWND)frmMainPtrGet->GetHandle());
+
+							if (!CryptUIDlgViewCertificate(&CertificateData, &ModifiedCertificateData)) {
+								wxMessageBox(_("An error occured while trying to open the certificate dialog."), _("Error opening Certificate Information dialog"));
+							}
+
+							if (ModifiedCertificateData == false) {
+
+								frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnObjectIter->second->BuildSSLCollection());
+								iter->second = 2;
+								break;
+
+							} else {
+
+								frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnObjectIter->second->BuildSSLCollection());
+
+							}
+
 #else
 	
 							bool UsingSSLBypass = false;