Skip to content

refactor UnityGroup->getRequests #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
simonLeary42 wants to merge 1 commit into from
Closed

refactor UnityGroup->getRequests #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions resources/lib/UnityGroup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand All @@ -456,7 +447,6 @@ public function getRequests()
]
);
}

return $out;
}

Expand Down
15 changes: 7 additions & 8 deletions webroot/admin/pi-mgmt.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,22 +67,21 @@

<?php
$requests = $SQL->getRequests();

foreach ($requests as $request) {
foreach ($requests as [$uid, $timestamp, $firstname, $lastname, $email, $org]) {
echo "<tr>";
echo "<td>" . $request["firstname"] . " " . $request["lastname"] . "</td>";
echo "<td>" . $request["uid"] . "</td>";
echo "<td><a href='mailto:" . $request["email"] . "'>" . $request["email"] . "</a></td>";
echo "<td>" . $firstname . " " . $lastname . "</td>";
echo "<td>" . $uid . "</td>";
echo "<td><a href='mailto:" . $email . "'>" . $email . "</a></td>";
echo "<td>" . date("jS F, Y", strtotime($request['timestamp'])) . "</td>";
echo "<td>";
echo
"<form action='' method='POST'>
<input type='hidden' name='form_type' value='req'>
<input type='hidden' name='uid' value='" . $request["uid"] . "'>
<input type='hidden' name='uid' value='" . $uid . "'>
<input type='submit' name='action' value='Approve'
onclick='return confirm(\"Are you sure you want to approve " . $request["uid"] . "?\");'>
onclick='return confirm(\"Are you sure you want to approve " . $uid . "?\");'>
<input type='submit' name='action' value='Deny'
onclick='return confirm(\"Are you sure you want to deny " . $request["uid"] . "?\");'>
onclick='return confirm(\"Are you sure you want to deny " . $uid . "?\");'>
</form>";
echo "</td>";
echo "</tr>";
Expand Down
3 changes: 1 addition & 2 deletions webroot/panel/pi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@
echo "<h5>Pending Requests</h5>";
echo "<table>";

foreach ($requests as [$user, $timestamp, $firstname, $lastname, $email, $org]) {
$uid = $user->uid;
foreach ($requests as [$uid, $timestamp, $firstname, $lastname, $email, $org]) {
$date = date("jS F, Y", strtotime($timestamp));
echo "<tr>";
echo "<td>" . $firstname . " " . $lastname . "</td>";
Expand Down
13 changes: 6 additions & 7 deletions workers/group_user_request_owner_reminder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
);
}
Expand Down
Loading