Remove duplicate functionality; clean up calls

Author: bryank-cs

resources/lib/UnityGroup.php

@@ -204,7 +204,7 @@ public function cancelGroupRequest($send_mail = true)
             return;
         }
 
-        $this->SQL->deleteGroupRequestByUserAndPI($this->getOwner()->getUID(), "admin");
+        $this->SQL->removeRequest($this->getOwner()->getUID());
 
         if ($send_mail) {
             // send email to requestor
@@ -221,7 +221,7 @@ public function cancelGroupJoinRequest($user, $send_mail = true)
             return;
         }
 
-        $this->SQL->deleteGroupRequestByUserAndPI($user->getUID(), $this->pi_uid);
+        $this->SQL->removeRequest($user->getUID(), $this->pi_uid);
 
         if ($send_mail) {
             // send email to requestor
@@ -286,7 +286,7 @@ public function approveUser($new_user, $send_mail = true)
         $this->addUserToGroup($new_user);
 
         // remove request, this will fail silently if the request doesn't exist
-        $this->removeRequest($new_user->getUID());
+        $this->SQL->removeRequest($new_user->getUID(), $this->pi_uid);
 
         // send email to the requestor
         if ($send_mail) {
@@ -318,7 +318,7 @@ public function denyUser($new_user, $send_mail = true)
         }
 
         // remove request, this will fail silently if the request doesn't exist
-        $this->removeRequest($new_user->getUID());
+        $this->SQL->removeRequest($new_user->getUID(), $this->pi_uid);
 
         if ($send_mail) {
             // send email to the user
@@ -557,11 +557,6 @@ private function addRequest($uid)
         $this->SQL->addRequest($uid, $this->pi_uid);
     }
 
-    private function removeRequest($uid)
-    {
-        $this->SQL->removeRequest($uid, $this->pi_uid);
-    }
-
     //
     // Public helper functions
     //

resources/lib/UnitySQL.php

@@ -53,17 +53,6 @@ public function addRequest($requestor, $dest = self::REQUEST_BECOME_PI)
         $stmt->execute();
     }
 
-    public function deleteGroupRequestByUserAndPI($user, $pi_uid)
-    {
-        $stmt = $this->conn->prepare(
-            "DELETE FROM " . self::TABLE_REQS . " WHERE uid=:uid AND request_for=:request_for"
-        );
-        $stmt->bindParam(":uid", $user);
-        $stmt->bindParam(":request_for", $pi_uid);
-
-        $stmt->execute();
-    }
-
     public function removeRequest($requestor, $dest = self::REQUEST_BECOME_PI)
     {
         if (!$this->requestExists($requestor, $dest)) {