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 @@ Name Unity ID Mail + Requested On Actions @@ -83,6 +84,7 @@ echo "" . $request_user->getFirstname() . " " . $request_user->getLastname() . ""; echo "" . $request_user->getUID() . ""; echo "" . $request_user->getMail() . ""; + echo "" . date("jS F, Y", strtotime($request['timestamp'])) . ""; echo ""; echo "
diff --git a/webroot/panel/groups.php b/webroot/panel/groups.php index 94607cbc..9dd5e7af 100644 --- a/webroot/panel/groups.php +++ b/webroot/panel/groups.php @@ -71,6 +71,7 @@ echo "" . $requested_owner->getFirstname() . " " . $requested_owner->getLastname() . ""; echo "" . $requested_account->getPIUID() . ""; echo "" . $requested_owner->getMail() . ""; + echo "" . date("jS F, Y", strtotime($request['timestamp'])) . ""; echo ""; echo ""; } diff --git a/webroot/panel/pi.php b/webroot/panel/pi.php index 393816b9..f8b472e5 100644 --- a/webroot/panel/pi.php +++ b/webroot/panel/pi.php @@ -60,18 +60,19 @@ foreach ($requests as $request) { echo ""; - echo "" . $request->getFirstname() . " " . $request->getLastname() . ""; - echo "" . $request->getUID() . ""; - echo "" . $request->getMail() . ""; + echo "" . $request[0]->getFirstname() . " " . $request[0]->getLastname() . ""; + echo "" . $request[0]->getUID() . ""; + echo "" . $request[0]->getMail() . ""; + echo "" . date("jS F, Y", strtotime($request[1])) . ""; echo ""; echo " - + + onclick='return confirm(\"Are you sure you want to approve " . $request[0]->getUID() . "?\")'> + onclick='return confirm(\"Are you sure you want to deny " . $request[0]->getUID() . "?\")'>
"; echo ""; echo "";