From aefb602480f7fba1d8a5045f94d83c61197b684d Mon Sep 17 00:00:00 2001 From: Adam Winberg Date: Fri, 15 Apr 2016 08:49:10 +0200 Subject: [PATCH] Added '^' and '$' as allowed characters in regex split to be able to use start-of-string/end-of-string in LIKE statements for device groups --- html/includes/forms/parse-device-group.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/includes/forms/parse-device-group.inc.php b/html/includes/forms/parse-device-group.inc.php index 146b8fde1f..d76fd498bb 100644 --- a/html/includes/forms/parse-device-group.inc.php +++ b/html/includes/forms/parse-device-group.inc.php @@ -20,7 +20,7 @@ $group_id = $_POST['group_id']; if (is_numeric($group_id) && $group_id > 0) { $group = dbFetchRow('SELECT * FROM `device_groups` WHERE `id` = ? LIMIT 1', array($group_id)); - $group_split = preg_split('/([a-zA-Z0-9_\-\.\=\%\<\>\ \"\'\!\~\(\)\*\/\@\[\]]+[&&\|\|]+)/', $group['pattern'], -1, (PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY)); + $group_split = preg_split('/([a-zA-Z0-9_\-\.\=\%\<\>\ \"\'\!\~\(\)\*\/\@\[\]\^\$]+[&&\|\|]+)/', $group['pattern'], -1, (PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY)); $count = (count($group_split) - 1); if (preg_match('/\&\&$/', $group_split[$count]) == 1 || preg_match('/\|\|$/', $group_split[$count]) == 1) { $group_split[$count] = $group_split[$count];