diff --git a/resources/lib/UnityGroup.php b/resources/lib/UnityGroup.php index 5eadb0f2..4d455ea6 100644 --- a/resources/lib/UnityGroup.php +++ b/resources/lib/UnityGroup.php @@ -433,21 +433,12 @@ public function newUserRequest($new_user, $firstname, $lastname, $email, $org, $ public function getRequests() { $requests = $this->SQL->getRequests($this->gid); - $out = array(); foreach ($requests as $request) { - $user = new UnityUser( - $request["uid"], - $this->LDAP, - $this->SQL, - $this->MAILER, - $this->REDIS, - $this->WEBHOOK - ); array_push( $out, [ - $user, + $request["uid"], $request["timestamp"], $request["firstname"], $request["lastname"], @@ -456,7 +447,6 @@ public function getRequests() ] ); } - return $out; } diff --git a/webroot/admin/pi-mgmt.php b/webroot/admin/pi-mgmt.php index f678e4a0..72c61586 100644 --- a/webroot/admin/pi-mgmt.php +++ b/webroot/admin/pi-mgmt.php @@ -67,22 +67,21 @@ getRequests(); - - foreach ($requests as $request) { + foreach ($requests as [$uid, $timestamp, $firstname, $lastname, $email, $org]) { echo "
| " . $firstname . " " . $lastname . " | "; diff --git a/workers/group_user_request_owner_reminder.php b/workers/group_user_request_owner_reminder.php index 6b84c735..e673c9f0 100644 --- a/workers/group_user_request_owner_reminder.php +++ b/workers/group_user_request_owner_reminder.php @@ -13,24 +13,23 @@ foreach ($accounts as $pi_group) { $pi_user = $pi_group->getOwner(); $requests = $pi_group->getRequests(); - foreach ($requests as $request) { + foreach ($requests as [$uid, $timestamp, $firstname, $lastname, $email, $org]) { $request_date = strtotime($request[1]); $daysDifference = ($today - $request_date) / (60 * 60 * 24); if ($daysDifference > 34) { // No interface in UnityGroup for this, so use DB directly - $SQL->removeRequest($request[0]->uid, $pi_group->gid); + $SQL->removeRequest($uid, $pi_group->gid); } elseif ($daysDifference > 1 && $daysDifference % 7 == 0) { - $new_user = $request[0]; // send email to PI $MAILER->sendMail( $pi_user->getMail(), "group_user_request_owner", array( "group" => $pi_group->gid, - "user" => $new_user->uid, - "name" => $new_user->getFullName(), - "email" => $new_user->getMail(), - "org" => $new_user->getOrg() + "user" => $uid, + "name" => $firstname . " " . $lastname, + "email" => $email, + "org" => $org, ) ); }