Check for LOWER() when building filter key for encyrpted fields, and …

…build the LOWER(CONVERT(AES_DECRYPT())) command.
Fabrik · Dec 8, 2017 · c1d1217 · c1d1217
1 parent d2497f2
commit c1d1217
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/components/com_fabrik/models/element.php b/components/com_fabrik/models/element.php
@@ -4697,7 +4697,15 @@ public function encryptFieldName(&$key)
 		{
 			$db     = FabrikWorker::getDbo();
 			$secret = $this->config->get('secret');
-			$key    = 'AES_DECRYPT(' . $key . ', ' . $db->q($secret) . ')';
+			$matches = array();
+			if (preg_match('/LOWER\((.*)\)/', $key, $matches))
+			{
+				$key = 'LOWER(CONVERT(AES_DECRYPT(' . $matches[1] . ', ' . 	$db->q($secret) . ') USING utf8))';
+			}
+			else
+			{
+				$key = 'AES_DECRYPT(' . $key . ', ' . $db->q($secret) . ')';
+			}
 		}
 	}