2 files changed, 44 insertions, 0 deletions

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
@@ -19,2 +19,5 @@
  * $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
@@ -449,2 +452,18 @@ bool OContactAccessBackend_XML::hasQuerySettings (uint querySettings) const
 
+        // 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 )
@@ -452,2 +471,3 @@ bool OContactAccessBackend_XML::hasQuerySettings (uint querySettings) const
 
+        // WildCards, RegExp and ExactMatch should never used at the same time 
         switch ( querySettings & ~( OContactAccess::IgnoreCase
@@ -465,2 +485,4 @@ bool OContactAccessBackend_XML::hasQuerySettings (uint querySettings) const
                 return ( true );
+        case 0: // one of the upper removed bits were set..
+                return ( true );
         default:
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
@@ -19,2 +19,5 @@
  * $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
@@ -449,2 +452,18 @@ bool OContactAccessBackend_XML::hasQuerySettings (uint querySettings) const
 
+        // 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 )
@@ -452,2 +471,3 @@ bool OContactAccessBackend_XML::hasQuerySettings (uint querySettings) const
 
+        // WildCards, RegExp and ExactMatch should never used at the same time 
         switch ( querySettings & ~( OContactAccess::IgnoreCase
@@ -465,2 +485,4 @@ bool OContactAccessBackend_XML::hasQuerySettings (uint querySettings) const
                 return ( true );
+        case 0: // one of the upper removed bits were set..
+                return ( true );
         default: