fix(simpleplugin) Fix Cognitive Complexity for Sonar

issue #5817

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;
         }
       }

[bmortier]

SonarQube analysis reported 1 issue

• 1 critical

Note: The following issues were found on lines that were not modified in the commit. Because these issues can't be reported as line comments, they are summarized here:

1. Refactor this function to reduce its Cognitive Complexity from 16 to the 15 allowed.

By Ghost User on 2018-04-18T09:20:00 (imported from GitLab)