From 7fed22ccbc1272fe0c5fb1c7f47bc330f118b854 Mon Sep 17 00:00:00 2001
From: eilers <eilers>
Date: Mon, 07 Jul 2003 16:19:47 +0000
Subject: Fixing serious bug in hasQuerySettings()

---
diff --git a/libopie/pim/ocontactaccessbackend_xml.cpp b/libopie/pim/ocontactaccessbackend_xml.cpp
index 661cd51..097142b 100644
--- a/libopie/pim/ocontactaccessbackend_xml.cpp
+++ b/libopie/pim/ocontactaccessbackend_xml.cpp
@@ -17,6 +17,9 @@
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.6  2003/07/07 16:19:47  eilers
+ * Fixing serious bug in hasQuerySettings()
+ *
  * Revision 1.5  2003/04/13 18:07:10  zecke
  * More API doc
  * QString -> const QString&
@@ -447,9 +450,26 @@ bool OContactAccessBackend_XML::hasQuerySettings (uint querySettings) const
 	 * Wildcards, RegExp, ExactMatch should never used at the same time...
 	 */
 
+	// Step 1: Check whether the given settings are supported by this backend
+	if ( ( querySettings & ( 
+				OContactAccess::IgnoreCase
+				| OContactAccess::WildCards
+				| OContactAccess::DateDiff
+				| OContactAccess::DateYear
+				| OContactAccess::DateMonth
+				| OContactAccess::DateDay
+				| OContactAccess::RegExp
+				| OContactAccess::ExactMatch
+			       ) ) != querySettings )
+		return false;
+
+	// Step 2: Check whether the given combinations are ok..
+
+	// IngoreCase alone is invalid
 	if ( querySettings == OContactAccess::IgnoreCase )
 		return false;
 
+	// WildCards, RegExp and ExactMatch should never used at the same time 
 	switch ( querySettings & ~( OContactAccess::IgnoreCase
 				    | OContactAccess::DateDiff
 				    | OContactAccess::DateYear
@@ -463,6 +483,8 @@ bool OContactAccessBackend_XML::hasQuerySettings (uint querySettings) const
 		return ( true );
 	case OContactAccess::ExactMatch:
 		return ( true );
+	case 0: // one of the upper removed bits were set..
+		return ( true );
 	default:
 		return ( false );
 	}
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
index 661cd51..097142b 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
@@ -17,6 +17,9 @@
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.6  2003/07/07 16:19:47  eilers
+ * Fixing serious bug in hasQuerySettings()
+ *
  * Revision 1.5  2003/04/13 18:07:10  zecke
  * More API doc
  * QString -> const QString&
@@ -447,9 +450,26 @@ bool OContactAccessBackend_XML::hasQuerySettings (uint querySettings) const
 	 * Wildcards, RegExp, ExactMatch should never used at the same time...
 	 */
 
+	// Step 1: Check whether the given settings are supported by this backend
+	if ( ( querySettings & ( 
+				OContactAccess::IgnoreCase
+				| OContactAccess::WildCards
+				| OContactAccess::DateDiff
+				| OContactAccess::DateYear
+				| OContactAccess::DateMonth
+				| OContactAccess::DateDay
+				| OContactAccess::RegExp
+				| OContactAccess::ExactMatch
+			       ) ) != querySettings )
+		return false;
+
+	// Step 2: Check whether the given combinations are ok..
+
+	// IngoreCase alone is invalid
 	if ( querySettings == OContactAccess::IgnoreCase )
 		return false;
 
+	// WildCards, RegExp and ExactMatch should never used at the same time 
 	switch ( querySettings & ~( OContactAccess::IgnoreCase
 				    | OContactAccess::DateDiff
 				    | OContactAccess::DateYear
@@ -463,6 +483,8 @@ bool OContactAccessBackend_XML::hasQuerySettings (uint querySettings) const
 		return ( true );
 	case OContactAccess::ExactMatch:
 		return ( true );
+	case 0: // one of the upper removed bits were set..
+		return ( true );
 	default:
 		return ( false );
 	}
--
cgit v0.9.0.2