Skip to content

Commit fc32696

Browse files
simonLeary42simonLeary42
committed
mermber -> member
1 parent ece216f commit fc32696

File tree

11 files changed

+25
-25
lines changed

11 files changed

+25
-25
lines changed

‎resources/lib/PosixGroup.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function removeMemberUIDs(array $uids): void
7575
$this->entry->write();
7676
}
7777

78-
public function mermberUIDExists(string $uid): bool
78+
public function memberUIDExists(string $uid): bool
7979
{
8080
return in_array($uid, $this->getMemberUIDs());
8181
}

‎resources/lib/UnityGroup.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ public function denyUser(UnityUser $new_user, bool $send_mail = true): void
214214

215215
public function removeUser(UnityUser $new_user, bool $send_mail = true): void
216216
{
217-
if (!$this->mermberUIDExists($new_user->uid)) {
217+
if (!$this->memberUIDExists($new_user->uid)) {
218218
return;
219219
}
220220
if ($new_user->uid == $this->getOwner()->uid) {
@@ -238,7 +238,7 @@ public function removeUser(UnityUser $new_user, bool $send_mail = true): void
238238

239239
public function newUserRequest(UnityUser $new_user, bool $send_mail = true): void
240240
{
241-
if ($this->mermberUIDExists($new_user->uid)) {
241+
if ($this->memberUIDExists($new_user->uid)) {
242242
UnityHTTPD::errorLog("warning", "user '$new_user' already in group");
243243
return;
244244
}

‎resources/lib/UnityUser.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function init(
9090
$org->init();
9191
}
9292

93-
if (!$org->mermberUIDExists($this->uid)) {
93+
if (!$org->memberUIDExists($this->uid)) {
9494
$org->addMemberUID($this->uid);
9595
}
9696

‎test/functional/PIMemberRequestTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function testRequestMembership()
3838
$uid = $USER->uid;
3939
$this->assertFalse($USER->isPI());
4040
$this->assertFalse($SQL->requestExists($uid, UnitySQL::REQUEST_BECOME_PI));
41-
$this->assertFalse($pi_group->mermberUIDExists($USER->uid));
41+
$this->assertFalse($pi_group->memberUIDExists($USER->uid));
4242
try {
4343
$this->requestMembership($gid);
4444
$this->assertTrue($SQL->requestExists($uid, $gid));

‎test/functional/PiMemberApproveTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function testApproveNonexistentRequest()
5454
$this->assertTrue($piGroup->exists());
5555
$this->assertGroupMembers($piGroup, [$piUID]);
5656
$this->assertEmpty($piGroup->getRequests());
57-
$this->assertFalse($piGroup->mermberUIDExists($user->uid));
57+
$this->assertFalse($piGroup->memberUIDExists($user->uid));
5858
$this->assertEmpty($piGroup->getRequests());
5959
try {
6060
$this->expectException(Exception::class); // FIXME more specific exception type
@@ -77,7 +77,7 @@ public function testApproveMemberByPI()
7777
$this->assertTrue($USER->exists());
7878
$this->assertTrue($pi_group->exists());
7979
$this->assertGroupMembers($pi_group, [$pi_uid]);
80-
$this->assertTrue(!$pi_group->mermberUIDExists($USER->uid));
80+
$this->assertTrue(!$pi_group->memberUIDExists($USER->uid));
8181
$this->assertRequestedMembership(false, $gid);
8282
try {
8383
$this->requestGroupMembership($pi_group->gid);
@@ -106,7 +106,7 @@ public function testApproveMemberByPI()
106106

107107
$this->assertTrue(!$pi_group->requestExists($USER));
108108
$this->assertRequestedMembership(false, $gid);
109-
$this->assertTrue($pi_group->mermberUIDExists($USER->uid));
109+
$this->assertTrue($pi_group->memberUIDExists($USER->uid));
110110
$this->assertTrue($USER->isQualified());
111111

112112
// $third_request_failed = false;
@@ -137,7 +137,7 @@ public function testApproveMemberByAdmin()
137137
$this->assertTrue($USER->exists());
138138
$this->assertTrue($pi_group->exists());
139139
$this->assertGroupMembers($pi_group, [$pi_uid]);
140-
$this->assertTrue(!$pi_group->mermberUIDExists($USER->uid));
140+
$this->assertTrue(!$pi_group->memberUIDExists($USER->uid));
141141
$this->assertRequestedMembership(false, $gid);
142142
try {
143143
$this->requestGroupMembership($pi_group->gid);
@@ -166,7 +166,7 @@ public function testApproveMemberByAdmin()
166166

167167
$this->assertTrue(!$pi_group->requestExists($USER));
168168
$this->assertRequestedMembership(false, $gid);
169-
$this->assertTrue($pi_group->mermberUIDExists($USER->uid));
169+
$this->assertTrue($pi_group->memberUIDExists($USER->uid));
170170
$this->assertTrue($USER->isQualified());
171171

172172
// $third_request_failed = false;

‎test/functional/PiMemberDenyTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ public function testDenyRequest()
3636
$requestedUser = new UnityUser(self::$requestUid, $LDAP, $SQL, $MAILER, $WEBHOOK);
3737
try {
3838
$piGroup->newUserRequest($requestedUser);
39-
$this->assertFalse($piGroup->mermberUIDExists($requestedUser->uid));
39+
$this->assertFalse($piGroup->memberUIDExists($requestedUser->uid));
4040

4141
$piGroup->denyUser($requestedUser);
4242
$this->assertEmpty($piGroup->getRequests());
4343
$this->assertEqualsCanonicalizing([$pi->uid], $piGroup->getMemberUIDs());
44-
$this->assertFalse($piGroup->mermberUIDExists($requestedUser->uid));
44+
$this->assertFalse($piGroup->memberUIDExists($requestedUser->uid));
4545
} finally {
4646
$SQL->removeRequest(self::$requestUid, $piGroup->gid);
4747
}

‎test/functional/PiRemoveUserTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ public function testRemoveUser()
3737
}
3838
}
3939
$this->assertNotEquals($pi->uid, $memberToDelete->uid);
40-
$this->assertTrue($piGroup->mermberUIDExists($memberToDelete->uid));
40+
$this->assertTrue($piGroup->memberUIDExists($memberToDelete->uid));
4141
try {
4242
$this->removeUser($memberToDelete->uid);
43-
$this->assertFalse($piGroup->mermberUIDExists($memberToDelete->uid));
43+
$this->assertFalse($piGroup->memberUIDExists($memberToDelete->uid));
4444
} finally {
45-
if (!$piGroup->mermberUIDExists($memberToDelete->uid)) {
45+
if (!$piGroup->memberUIDExists($memberToDelete->uid)) {
4646
$piGroup->newUserRequest($memberToDelete);
4747
$piGroup->approveUser($memberToDelete);
4848
}
@@ -56,13 +56,13 @@ public function testRemovePIFromTheirOwnGroup()
5656
$pi = $USER;
5757
$piGroup = $USER->getPIGroup();
5858
$this->assertTrue($piGroup->exists());
59-
$this->assertTrue($piGroup->mermberUIDExists($pi->uid));
59+
$this->assertTrue($piGroup->memberUIDExists($pi->uid));
6060
$this->expectException(Exception::class);
6161
try {
6262
$this->removeUser($pi->uid);
63-
$this->assertTrue($piGroup->mermberUIDExists($pi->uid));
63+
$this->assertTrue($piGroup->memberUIDExists($pi->uid));
6464
} finally {
65-
if (!$piGroup->mermberUIDExists($pi->uid)) {
65+
if (!$piGroup->memberUIDExists($pi->uid)) {
6666
$piGroup->newUserRequest($pi);
6767
$piGroup->approveUser($pi);
6868
}

‎test/phpunit-bootstrap.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,9 @@ function ensureUserDoesNotExist()
175175
$SQL->deleteRequestsByUser($USER->uid);
176176
if ($USER->exists()) {
177177
$org = $USER->getOrgGroup();
178-
if ($org->exists() and $org->mermberUIDExists($USER->uid)) {
178+
if ($org->exists() and $org->memberUIDExists($USER->uid)) {
179179
$org->removeUser($USER);
180-
ensure(!$org->mermberUIDExists($USER->uid));
180+
ensure(!$org->memberUIDExists($USER->uid));
181181
}
182182
$LDAP->getUserEntry($USER->uid)->delete();
183183
ensure(!$USER->exists());
@@ -221,9 +221,9 @@ function ensureUserNotRequestedAccountDeletion()
221221
function ensureUserNotInPIGroup(UnityGroup $pi_group)
222222
{
223223
global $USER;
224-
if ($pi_group->mermberUIDExists($USER->uid)) {
224+
if ($pi_group->memberUIDExists($USER->uid)) {
225225
$pi_group->removeUser($USER);
226-
ensure(!$pi_group->mermberUIDExists($USER->uid));
226+
ensure(!$pi_group->memberUIDExists($USER->uid));
227227
}
228228
}
229229

‎webroot/panel/ajax/get_group_members.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
$gid = UnityHTTPD::getQueryParameter("gid");
1010
$group = new UnityGroup($gid, $LDAP, $SQL, $MAILER, $WEBHOOK);
11-
if (!$group->mermberUIDExists($USER->uid)) {
11+
if (!$group->memberUIDExists($USER->uid)) {
1212
UnityHTTPD::forbidden("not a group member");
1313
}
1414
$members = $group->getGroupMembersAttributes(["gecos", "mail"]);

‎webroot/panel/groups.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
);
4040
UnityHTTPD::redirect();
4141
}
42-
if ($pi_account->mermberUIDExists($USER->uid)) {
42+
if ($pi_account->memberUIDExists($USER->uid)) {
4343
UnityHTTPD::messageError(
4444
"Invalid Group Membership Request",
4545
"You're already in this PI group"

0 commit comments

Comments
 (0)