deactivate/reactivate -> disable/reenable

simonLeary42 · simonLeary42 · commit 7b65b6416cf0 · 2026-01-13T12:01:11.000-05:00
diff --git a/LDAP.md b/LDAP.md
@@ -3,5 +3,5 @@ Terminology:
 - **qualified user**: a user who is currently a PI or a member of at least one PI group
 - **native user**: a user who's entries exist in the OUs given in `config.ini`
   - it is up to the administrator to ensure that no non-native entries exist in these OUs
-- **defunct group**: a PI group that was deactivated by its owner or had its owner deactivated
+- **defunct group**: a PI group that was disabled by its owner or had its owner disabled
   - memberuid attribute should be empty
diff --git a/resources/lib/UnityGroup.php b/resources/lib/UnityGroup.php
@@ -63,14 +63,14 @@ public function requestGroup(?bool $send_mail_to_admins = null, bool $send_mail
         }
     }
 
-    public function deactivate(bool $send_mail = true): void
+    public function disable(bool $send_mail = true): void
     {
-        $this->SQL->addLog("deactivate_pi_group", $this->gid);
+        $this->SQL->addLog("disable_pi_group", $this->gid);
         $memberuids = $this->getMemberUIDs();
         if ($send_mail) {
             $member_attributes = $this->LDAP->getUsersAttributes($memberuids, ["mail"]);
             $member_mails = array_map(fn($x) => $x["mail"][0], $member_attributes);
-            $this->MAILER->sendMail($member_mails, "group_deactivated", [
+            $this->MAILER->sendMail($member_mails, "group_disabled", [
                 "group_name" => $this->gid,
             ]);
         }
@@ -89,11 +89,11 @@ public function deactivate(bool $send_mail = true): void
         // }
     }
 
-    private function reactivate(bool $send_mail = true)
+    private function reenable(bool $send_mail = true)
     {
-        $this->SQL->addLog("reactivated_pi_group", $this->gid);
+        $this->SQL->addLog("reenabled_pi_group", $this->gid);
         if ($send_mail) {
-            $this->MAILER->sendMail($this->getOwner()->getMail(), "group_reactivated", [
+            $this->MAILER->sendMail($this->getOwner()->getMail(), "group_reenabled", [
                 "group_name" => $this->gid,
             ]);
         }
@@ -117,7 +117,7 @@ public function approveGroup(bool $send_mail = true): void
         if (!$this->entry->exists()) {
             $this->init();
         } elseif ($this->getIsDefunct()) {
-            $this->reactivate();
+            $this->reenable();
         } else {
             throw new Exception("cannot approve group that already exists and is not defunct");
         }
@@ -236,7 +236,7 @@ public function removeUser(UnityUser $new_user, bool $send_mail = true): void
             return;
         }
         if ($new_user->uid == $this->getOwner()->uid) {
-            throw new Exception("Cannot delete group owner from group. Deactivate group instead");
+            throw new Exception("Cannot delete group owner from group. Disable group instead");
         }
         // remove request, this will fail silently if the request doesn't exist
         $this->removeMemberUID($new_user->uid);
diff --git a/resources/mail/group_disabled.php b/resources/mail/group_disabled.php
@@ -1,11 +1,11 @@
 <?php
 
-// This template is sent to all users of a group when that group is deactivated
-$this->Subject = "PI Group Deactivated"; ?>
+// This template is sent to all users of a group when that group is disabled
+$this->Subject = "PI Group Disabled"; ?>
 
 <p>Hello,</p>
 
-<p>Your PI group, <?php echo $data["group_name"]; ?>, has been deactivated on the UnityHPC Platform.
+<p>Your PI group, <?php echo $data["group_name"]; ?>, has been disabled on the UnityHPC Platform.
 Any jobs associated with this PI account have been killed.</p>
 
 <p>If you believe this to be a mistake, please reply to this email</p>
diff --git a/resources/mail/group_reenabled.php b/resources/mail/group_reenabled.php
@@ -1,12 +1,12 @@
 <?php
 
-// This template is sent to the group owner when that group is re-activated
-$this->Subject = "PI Group Re-Activated"; ?>
+// This template is sent to the group owner when that group is re-enabled
+$this->Subject = "PI Group Re-Enabled"; ?>
 
 <p>Hello,</p>
 
 <p>
-Your PI group, <?php echo $data["group_name"]; ?>, has been reactivated on the UnityHPC Platform.
+Your PI group, <?php echo $data["group_name"]; ?>, has been reenabled on the UnityHPC Platform.
 </p>
 
 <p>If you believe this to be a mistake, please reply to this email</p>
diff --git a/resources/mail/user_flag_removed.php b/resources/mail/user_flag_removed.php
@@ -1,9 +1,9 @@
 <?php use UnityWebPortal\lib\UserFlag; ?>
 <?php switch ($data["flag"]):
 case UserFlag::QUALIFIED: ?>
-<?php $this->Subject = "User Deactivated"; ?>
+<?php $this->Subject = "User Disabled"; ?>
 <p>Hello,</p>
-<p>Your account on the UnityHPC Platform has been deactivated.</p>
+<p>Your account on the UnityHPC Platform has been disabled.</p>
 <p>If you believe this to be a mistake, please reply to this email as soon as possible.</p>
 <?php break; ?>
 
diff --git a/test/functional/PIBecomeApproveTest.php b/test/functional/PIBecomeApproveTest.php
@@ -76,7 +76,7 @@ public function testApprovePI()
         }
     }
 
-    public function testReactivateGroup()
+    public function testReenableGroup()
     {
         global $USER, $SSO, $LDAP, $SQL, $MAILER, $WEBHOOK;
         $this->switchUser("ResurrectedOwnerOfDefunctPIGroup");
diff --git a/test/functional/PIDeactivateTest.php b/test/functional/PIDeactivateTest.php
@@ -1,9 +1,9 @@
 <?php
 use UnityWebPortal\lib\UserFlag;
 
-class PIDeactivateTest extends UnityWebPortalTestCase
+class PIDisableTest extends UnityWebPortalTestCase
 {
-    public function testDeactivateGroupByAdmin()
+    public function testDisableGroupByAdmin()
     {
         global $USER, $LDAP;
         $this->switchUser("EmptyPIGroupOwner");
@@ -32,7 +32,7 @@ public function testDeactivateGroupByAdmin()
         }
     }
 
-    public function testDeactivateGroupByOwner()
+    public function testDisableGroupByOwner()
     {
         global $USER, $LDAP;
         $this->switchUser("EmptyPIGroupOwner");
diff --git a/webroot/admin/pi-mgmt.php b/webroot/admin/pi-mgmt.php
@@ -44,9 +44,9 @@
             $parent = new UnityGroup($_POST["pi"], $LDAP, $SQL, $MAILER, $WEBHOOK);
             $parent->removeUser($form_user);
             break;
-        case "deactivate":
+        case "disable":
             $group = new UnityGroup(UnityHTTPD::getPostData("pi"), $LDAP, $SQL, $MAILER, $WEBHOOK);
-            $group->deactivate();
+            $group->disable();
             break;
     }
 }
@@ -139,13 +139,13 @@ class="filterSearch"
                 action=''
                 method='POST'
                 onsubmit='
-                    return confirm(\"Are you sure you want to deactivate group $gid?\")
+                    return confirm(\"Are you sure you want to disable group $gid?\")
                 '
             >
                 $CSRFTokenHiddenFormInput
-                <input type='hidden' name='form_type' value='deactivate'>
+                <input type='hidden' name='form_type' value='disable'>
                 <input type='hidden' name='pi' value='$gid'>
-                <input type='submit' value='Deactivate Group'>
+                <input type='submit' value='Disable Group'>
             </form>
         ";
         echo "</td>";
diff --git a/webroot/panel/pi.php b/webroot/panel/pi.php
@@ -33,8 +33,8 @@
             $group->removeUser($form_user);
 
             break;
-        case "deactivate":
-            $group->deactivate();
+        case "disable":
+            $group->disable();
             UnityHTTPD::redirect(getURL("panel/account.php"));
             break; /** @phpstan-ignore deadCode.unreachable */
     }
@@ -136,11 +136,11 @@
     <form
         action=''
         method='POST'
-        onsubmit='return confirm(\"Are you sure you want to deactivate your PI group?\")'
+        onsubmit='return confirm(\"Are you sure you want to disable your PI group?\")'
     >
         $CSRFTokenHiddenFormInput
-        <input type='hidden' name='form_type' value='deactivate'>
-        <input type='submit' value='Deactivate PI Account'>
+        <input type='hidden' name='form_type' value='disable'>
+        <input type='submit' value='Disable PI Account'>
     </form>
 ";
 

Original file line number	Diff line number	Diff line change
`@@ -63,14 +63,14 @@ public function requestGroup(?bool $send_mail_to_admins = null, bool $send_mail`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`66`		`- public function deactivate(bool $send_mail = true): void`
	`66`	`+ public function disable(bool $send_mail = true): void`
`67`	`67`	`{`
`68`		`- $this->SQL->addLog("deactivate_pi_group", $this->gid);`
	`68`	`+ $this->SQL->addLog("disable_pi_group", $this->gid);`
`69`	`69`	`$memberuids = $this->getMemberUIDs();`
`70`	`70`	`if ($send_mail) {`
`71`	`71`	`$member_attributes = $this->LDAP->getUsersAttributes($memberuids, ["mail"]);`
`72`	`72`	`$member_mails = array_map(fn($x) => $x["mail"][0], $member_attributes);`
`73`		`- $this->MAILER->sendMail($member_mails, "group_deactivated", [`
	`73`	`+ $this->MAILER->sendMail($member_mails, "group_disabled", [`
`74`	`74`	`"group_name" => $this->gid,`
`75`	`75`	`]);`
`76`	`76`	`}`
`@@ -89,11 +89,11 @@ public function deactivate(bool $send_mail = true): void`
`89`	`89`	`// }`
`90`	`90`	`}`
`91`	`91`
`92`		`- private function reactivate(bool $send_mail = true)`
	`92`	`+ private function reenable(bool $send_mail = true)`
`93`	`93`	`{`
`94`		`- $this->SQL->addLog("reactivated_pi_group", $this->gid);`
	`94`	`+ $this->SQL->addLog("reenabled_pi_group", $this->gid);`
`95`	`95`	`if ($send_mail) {`
`96`		`- $this->MAILER->sendMail($this->getOwner()->getMail(), "group_reactivated", [`
	`96`	`+ $this->MAILER->sendMail($this->getOwner()->getMail(), "group_reenabled", [`
`97`	`97`	`"group_name" => $this->gid,`
`98`	`98`	`]);`
`99`	`99`	`}`
`@@ -117,7 +117,7 @@ public function approveGroup(bool $send_mail = true): void`
`117`	`117`	`if (!$this->entry->exists()) {`
`118`	`118`	`$this->init();`
`119`	`119`	`} elseif ($this->getIsDefunct()) {`
`120`		`- $this->reactivate();`
	`120`	`+ $this->reenable();`
`121`	`121`	`} else {`
`122`	`122`	`throw new Exception("cannot approve group that already exists and is not defunct");`
`123`	`123`	`}`
`@@ -236,7 +236,7 @@ public function removeUser(UnityUser $new_user, bool $send_mail = true): void`
`236`	`236`	`return;`
`237`	`237`	`}`
`238`	`238`	`if ($new_user->uid == $this->getOwner()->uid) {`
`239`		`- throw new Exception("Cannot delete group owner from group. Deactivate group instead");`
	`239`	`+ throw new Exception("Cannot delete group owner from group. Disable group instead");`
`240`	`240`	`}`
`241`	`241`	`// remove request, this will fail silently if the request doesn't exist`
`242`	`242`	`$this->removeMemberUID($new_user->uid);`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function testApprovePI()`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
`79`		`- public function testReactivateGroup()`
	`79`	`+ public function testReenableGroup()`
`80`	`80`	`{`
`81`	`81`	`global $USER, $SSO, $LDAP, $SQL, $MAILER, $WEBHOOK;`
`82`	`82`	`$this->switchUser("ResurrectedOwnerOfDefunctPIGroup");`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`<?php`
`2`	`2`	`use UnityWebPortal\lib\UserFlag;`
`3`	`3`
`4`		`-class PIDeactivateTest extends UnityWebPortalTestCase`
	`4`	`+class PIDisableTest extends UnityWebPortalTestCase`
`5`	`5`	`{`
`6`		`- public function testDeactivateGroupByAdmin()`
	`6`	`+ public function testDisableGroupByAdmin()`
`7`	`7`	`{`
`8`	`8`	`global $USER, $LDAP;`
`9`	`9`	`$this->switchUser("EmptyPIGroupOwner");`
`@@ -32,7 +32,7 @@ public function testDeactivateGroupByAdmin()`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`		`- public function testDeactivateGroupByOwner()`
	`35`	`+ public function testDisableGroupByOwner()`
`36`	`36`	`{`
`37`	`37`	`global $USER, $LDAP;`
`38`	`38`	`$this->switchUser("EmptyPIGroupOwner");`