Merge branch 'main' into patch-6

Author: simonLeary42

resources/lib/UnityLDAP.php

@@ -332,4 +332,35 @@ public function getOrgGroupEntry($gid)
         $gid = ldap_escape($gid, LDAP_ESCAPE_DN);
         return $this->getEntry(unityLDAP::RDN . "=$gid," . $this->STR_ORGGROUPOU);
     }
+
+    public static function parseUserChildrenArray(array $userChildrenArray): array
+    {
+        // input comes from LdapEntry::getChildrenArray on a UnityUser
+        $output = [];
+        $required_string_attributes = [
+            "gidnumber",
+            "givenname",
+            "homedirectory",
+            "loginshell",
+            "mail",
+            "o",
+            "sn",
+            "uid",
+            "uidnumber",
+            "gecos",
+        ];
+        foreach ($required_string_attributes as $key) {
+            $output[$key] = $userChildrenArray[$key][0];
+        }
+        $output["firstname"] = $output["givenname"];
+        $output["lastname"] = $output["sn"];
+        $output["org"] = $output["o"];
+        $output["objectclass"] = $userChildrenArray["objectclass"];
+        if (array_key_exists("sspublickey", $userChildrenArray)) {
+            $output["sshpublickey"] = $userChildrenArray["sshpublickey"];
+        } else {
+            $output["sshpublickey"] = [];
+        }
+        return $output;
+    }
 }

resources/lib/UnityRedis.php

@@ -95,4 +95,9 @@ public function removeCacheArray($object, $key, $value)
             $this->setCache($object, $key, $cached_val);
         }
     }
+
+    public function flushAll()
+    {
+        $this->client->flushAll();
+    }
 }