Merge pull request #40 from sheldor1510/request-date

Adding request date to user/pi requests

Author: hakasapl

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;
+                }
             }
         }
 

webroot/admin/pi-mgmt.php

@@ -70,6 +70,7 @@
         <td>Name</td>
         <td>Unity ID</td>
         <td>Mail</td>
+        <td>Requested On</td>
         <td>Actions</td>
     </tr>
 
@@ -83,6 +84,7 @@
         echo "<td>" . $request_user->getFirstname() . " " . $request_user->getLastname() . "</td>";
         echo "<td>" . $request_user->getUID() . "</td>";
         echo "<td><a href='mailto:" . $request_user->getMail() . "'>" . $request_user->getMail() . "</a></td>";
+        echo "<td>" . date("jS F, Y", strtotime($request['timestamp'])) . "</td>";
         echo "<td>";
         echo
         "<form action='' method='POST'>

webroot/panel/groups.php

@@ -71,6 +71,7 @@
         echo "<td>" . $requested_owner->getFirstname() . " " . $requested_owner->getLastname() . "</td>";
         echo "<td>" . $requested_account->getPIUID() . "</td>";
         echo "<td><a href='mailto:" . $requested_owner->getMail() . "'>" . $requested_owner->getMail() . "</a></td>";
+        echo "<td>" . date("jS F, Y", strtotime($request['timestamp'])) . "</td>";
         echo "<td></td>";
         echo "</tr>";
     }

webroot/panel/pi.php

@@ -60,18 +60,19 @@
 
     foreach ($requests as $request) {
         echo "<tr>";
-        echo "<td>" . $request->getFirstname() . " " . $request->getLastname() . "</td>";
-        echo "<td>" . $request->getUID() . "</td>";
-        echo "<td><a href='mailto:" . $request->getMail() . "'>" . $request->getMail() . "</a></td>";
+        echo "<td>" . $request[0]->getFirstname() . " " . $request[0]->getLastname() . "</td>";
+        echo "<td>" . $request[0]->getUID() . "</td>";
+        echo "<td><a href='mailto:" . $request[0]->getMail() . "'>" . $request[0]->getMail() . "</a></td>";
+        echo "<td>" . date("jS F, Y", strtotime($request[1])) . "</td>";
         echo "<td>";
         echo
         "<form action='' method='POST'>
         <input type='hidden' name='form_name' value='userReq'>
-        <input type='hidden' name='uid' value='" . $request->getUID() . "'>
+        <input type='hidden' name='uid' value='" . $request[0]->getUID() . "'>
         <input type='submit' name='action' value='Approve' 
-        onclick='return confirm(\"Are you sure you want to approve " . $request->getUID() . "?\")'>
+        onclick='return confirm(\"Are you sure you want to approve " . $request[0]->getUID() . "?\")'>
         <input type='submit' name='action' value='Deny' 
-        onclick='return confirm(\"Are you sure you want to deny " . $request->getUID() . "?\")'>
+        onclick='return confirm(\"Are you sure you want to deny " . $request[0]->getUID() . "?\")'>
         </form>";
         echo "</td>";
         echo "</tr>";