Merge pull request #1250 from giohappy/master

Add ILIKE filter and % character to safe tokens
qgis · Mar 18, 2014 · 3094175 · 3094175
2 parents ef3189e + f61f250
commit 3094175
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -2009,10 +2009,12 @@ bool QgsWMSServer::testFilterStringSafety( const QString& filter ) const
          || tokenIt->compare( "<=" ) == 0
          || tokenIt->compare( ">" ) == 0
          || tokenIt->compare( ">=" ) == 0
+         || tokenIt->compare( "%" ) == 0
          || tokenIt->compare( "AND", Qt::CaseInsensitive ) == 0
          || tokenIt->compare( "OR", Qt::CaseInsensitive ) == 0
          || tokenIt->compare( "IN", Qt::CaseInsensitive ) == 0
          || tokenIt->compare( "LIKE", Qt::CaseInsensitive ) == 0
+         || tokenIt->compare( "ILIKE", Qt::CaseInsensitive ) == 0
          || tokenIt->compare( "DMETAPHONE", Qt::CaseInsensitive ) == 0
          || tokenIt->compare( "SOUNDEX", Qt::CaseInsensitive ) == 0 )
     {