From acef132ff984a5039e19a78a5c69b94e97c160c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@fusiondirectory.org>
Date: Thu, 28 Nov 2019 11:36:14 +0100
Subject: [PATCH] :ambulance: fix(userinfo) Sonar fix: merge if statement with
enclosing one
issue #6054
---
include/class_userinfo.inc | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index cfdb96634..e7438f084 100644
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -222,11 +222,9 @@ class userinfo
continue;
}
- if (!empty($ACLRule['userfilter'])) {
- /* Check if we match the user filter */
- if (!$ldap->object_match_filter($this->dn, $ACLRule['userfilter'])) {
- continue;
- }
+ if (!empty($ACLRule['userfilter']) && !$ldap->object_match_filter($this->dn, $ACLRule['userfilter'])) {
+ /* We do not match the user filter */
+ continue;
}
if (!empty($ACLRule['targetfilter'])) {
--
GitLab