diff --git a/resources/lib/UnityGroup.php b/resources/lib/UnityGroup.php index 984f27ff..72359f80 100644 --- a/resources/lib/UnityGroup.php +++ b/resources/lib/UnityGroup.php @@ -329,7 +329,8 @@ public function getRequests() $out = array(); foreach ($requests as $request) { - array_push($out, new UnityUser($request["uid"], $this->LDAP, $this->SQL, $this->MAILER)); + $user = new UnityUser($request["uid"], $this->LDAP, $this->SQL, $this->MAILER); + array_push($out, [$user, $request["timestamp"]]); } return $out; @@ -361,9 +362,12 @@ public function getGroupMemberUIDs() public function requestExists($user) { - foreach ($this->getRequests() as $requester) { - if ($requester->getUID() == $user->getUID()) { - return true; + $requesters = $this->getRequests(); + if (count($requesters) > 0) { + foreach ($requesters as $requester) { + if ($requester[0]->getUID() == $user->getUID()) { + return true; + } } } diff --git a/webroot/admin/pi-mgmt.php b/webroot/admin/pi-mgmt.php index 6ebfb255..dd8edd1c 100644 --- a/webroot/admin/pi-mgmt.php +++ b/webroot/admin/pi-mgmt.php @@ -70,6 +70,7 @@