// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
#include "frmEditAccount.h"
+#include "common/svrdlist.h"
frmEditAccount::frmEditAccount( wxWindow* parent )
:
if (TestConnection.SSLVerify() == COSSL_UNABLETOVERIFY){
#if defined(__APPLE__)
+
+ TestConnection.BypassSSLVerification(true);
+
+ COConnectResult TestConnectionResult = TestConnection.Connect(false);
+
+ TestConnection.BypassSSLVerification(false);
+
+ int SSLResult = DisplayTrustPanel(&TestConnection);
+
+ if (SSLResult != NSOKButton){
+
+ wxMessageBox(_("An error occured whilst connnecting: ") + TestConnection.GetErrorMessage(), _("Failed"), wxOK+wxICON_ERROR);
+ return;
+
+ }
+
#elif defined(__WIN32__)
TestConnection.BypassSSLVerification(true);
TestConnection.BypassSSLVerification(true);
COConnectResult TestConnectionResult = TestConnection.Connect(true);
-
- TestConnection.BypassSSLVerification(false);
} else if (SSLResult == 2){
void frmEditAccount::UpdateSettings( wxCommandEvent& event )
{
- // Check if server address matches against the blacklist.
+ // Check if server address matches against the dangerous list.
// Bring up warning message if it does.
- if (CheckBlacklist(txtAddress->GetValue())){
+ if (CheckDangerousList(txtAddress->GetValue())){
int MessageBoxResult = wxMessageBox(_("The server with the address given does not support the CardDAV protocol properly and shouldn't be used.\n\nData loss is very likely.\n\nDo you still want to continue using this server?"), _("Server warning"), wxYES_NO, this);
return DialogResult;
-}
\ No newline at end of file
+}