From ce4896f60ffb8ff59f61b1b050816c8cdc5890c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Wed, 18 Apr 2018 11:16:12 +0200
Subject: [PATCH] :ambulance: fix(simpleplugin) Fix Cognitive Complexity for
Sonar
issue #5817
---
include/simpleplugin/class_simplePlugin.inc | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/include/simpleplugin/class_simplePlugin.inc b/include/simpleplugin/class_simplePlugin.inc
index 9ca8a180d..811f4fd12 100644
--- a/include/simpleplugin/class_simplePlugin.inc
+++ b/include/simpleplugin/class_simplePlugin.inc
@@ -1805,11 +1805,7 @@ class simplePlugin
/* Try to use plain entry first */
$dn = $attribute.'='.ldap_escape_dn($this->$attribute).','.$base;
- if ($dn == $this->orig_dn) {
- return $dn;
- }
- $ldap->cat($dn, array('dn'));
- if (!$ldap->fetch()) {
+ if (($dn == $this->orig_dn) || !$ldap->dn_exists($dn)) {
return $dn;
}
@@ -1827,11 +1823,7 @@ class simplePlugin
$dn .= '+'.$attr.'='.ldap_escape_dn($this->$attr);
}
$dn .= ','.$base;
- if ($dn == $this->orig_dn) {
- return $dn;
- }
- $ldap->cat($dn, array('dn'));
- if (!$ldap->fetch()) {
+ if (($dn == $this->orig_dn) || !$ldap->dn_exists($dn)) {
return $dn;
}
}
--
GitLab