From e28efcfd21e6c7671f5a2d3e6ee5c8d011dc6ea8 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Sat, 1 Feb 2020 17:30:53 +0100
Subject: [PATCH] allow ^/$ in filter expression

---
 lam/lib/lists.inc | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lam/lib/lists.inc b/lam/lib/lists.inc
index 5c294a2a..c262a5b3 100644
--- a/lam/lib/lists.inc
+++ b/lam/lib/lists.inc
@@ -4,7 +4,7 @@ use LAM\TYPES\ConfiguredType;
 /*
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2003 - 2019  Roland Gruber
+  Copyright (C) 2003 - 2020  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -233,7 +233,7 @@ class lamList {
 					$foundFilter = $_POST["filter" . strtolower($this->attrArray[$i])];
 				}
 				if (isset($foundFilter) && ($foundFilter != '')) {
-					if (preg_match('/^([\p{L}\p{N} _\\*\\$\\.:@-])+$/iu', $foundFilter)) { // \p{L} matches any Unicode letter
+					if (preg_match('/^[\\^]?([\p{L}\p{N} _\\*\\$\\.:@-])+[\\$]?$/iu', $foundFilter)) { // \p{L} matches any Unicode letter
 						$this->filters[strtolower($this->attrArray[$i])] = $foundFilter;
 					}
 					else {
@@ -1084,10 +1084,16 @@ class lamList {
 				continue;
 			}
 			$filterExpression = $filter;
-			if (strpos($filter, '*') !== 0) {
+			if (strpos($filter, '^') === 0) {
+			    $filterExpression = substr($filterExpression, 1);
+            }
+			elseif (strpos($filter, '*') !== 0) {
 				$filterExpression = '*' . $filterExpression;
 			}
-			if (strrpos($filter, '*') !== (strlen($filter) - 1)) {
+			if (strrpos($filter, '$') === (strlen($filter) - 1)) {
+			    $filterExpression = substr($filterExpression, 0, -1);
+            }
+			elseif (strrpos($filter, '*') !== (strlen($filter) - 1)) {
 				$filterExpression = $filterExpression . '*';
 			}
 			$text .= '(' . $attr . '=' . $filterExpression . ')';