[QGIS Commit] r15182 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-02-17 04:56:23 -0800 (Thu, 17 Feb 2011)
New Revision: 15182

Modified:
   trunk/qgis/src/app/qgisapp.cpp
Log:
record which SSL errors are ok to ignore

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2011-02-17 12:07:42 UTC (rev 15181)
+++ trunk/qgis/src/app/qgisapp.cpp	2011-02-17 12:56:23 UTC (rev 15182)
@@ -7218,23 +7218,29 @@
 {
   QString msg = tr( "SSL errors occured accessing URL %1:" ).arg( reply->request().url().toString() );
   bool otherError = false;
+  static QSet<QSslError::SslError> ignoreErrors;
 
   foreach( QSslError error, errors )
   {
-    if ( error.error() != QSslError::SelfSignedCertificate &&
-         error.error() != QSslError::HostNameMismatch )
-      otherError = true;
+    QgsDebugMsg( QString( "SSL error %1: %2" ).arg( error.error() ).arg( error.errorString() ) );
+
+    otherError = otherError || !ignoreErrors.contains( error.error() );
+
     msg += "\n" + error.errorString();
   }
 
-  msg += tr( "\n\nIgnore errors?" );
+  msg += tr( "\n\nAlways ignore these errors?" );
 
   if ( !otherError ||
        QMessageBox::warning( this,
-                             tr( "SSL errors occured" ),
+                             tr( "%n SSL errors occured", "number of errors", errors.size() ),
                              msg,
                              QMessageBox::Ok | QMessageBox::Cancel ) == QMessageBox::Ok )
   {
+    foreach( QSslError error, errors )
+    {
+      ignoreErrors << error.error();
+    }
     reply->ignoreSslErrors();
   }
 }