Skip to content

Commit 43d3d36

Browse files
simonLeary42simonLeary42
committed
"modifier" -> "flag"
1 parent 997ec30 commit 43d3d36

21 files changed

+53
-53
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ rm "$prod" && ln -s "$old" "$prod"
120120
### 1.5.0 -> 1.5.1
121121

122122
- the `[site]getting_started_url` option should be defined
123-
- the `[ldap]admin_group` option has been renamed to `[ldap]user_modifier_groups[admin]`
124-
- the `[ldap]qualified_user_group` option has been renamed to `[ldap]user_modifier_groups[qualified]`
123+
- the `[ldap]admin_group` option has been renamed to `[ldap]user_flag_groups[admin]`
124+
- the `[ldap]qualified_user_group` option has been renamed to `[ldap]user_flag_groups[qualified]`
125125

126126
### 1.4 -> 1.5
127127

‎defaults/config.ini.default‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ def_user_shell = "/bin/bash" ; Default shell for new users
3535
offset_UIDGID = 1000000 ; start point when allocating new UID/GID pairs for a new user
3636
offset_PIGID = 2000000 ; start point when allocating new GID for a new PI group
3737
offset_ORGGID = 3000000 ; start point when allocating new GID for a new org group
38-
user_modifier_groups[admin] = "cn=web_admins,dc=unityhpc,dc=test" ; admin user group dn
39-
user_modifier_groups[ghost] = "cn=ghost,dc=unityhpc,dc=test" ; ghost user group dn
40-
user_modifier_groups[idlelocked] = "cn=idlelocked,dc=unityhpc,dc=test" ; idlelocked user group dn
41-
user_modifier_groups[locked] = "cn=locked,dc=unityhpc,dc=test" ; locked user group dn
42-
user_modifier_groups[qualified] = "cn=unityusers,dc=unityhpc,dc=test" ; qualified user group (in at least one PI group)
38+
user_flag_groups[admin] = "cn=web_admins,dc=unityhpc,dc=test" ; admin user group dn
39+
user_flag_groups[ghost] = "cn=ghost,dc=unityhpc,dc=test" ; ghost user group dn
40+
user_flag_groups[idlelocked] = "cn=idlelocked,dc=unityhpc,dc=test" ; idlelocked user group dn
41+
user_flag_groups[locked] = "cn=locked,dc=unityhpc,dc=test" ; locked user group dn
42+
user_flag_groups[qualified] = "cn=unityusers,dc=unityhpc,dc=test" ; qualified user group (in at least one PI group)
4343

4444
[sql]
4545
host = "sql" ; mariadb hostname

‎resources/init.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
$_SESSION["SSO"] = $SSO;
5757

5858
$OPERATOR = new UnityUser($SSO["user"], $LDAP, $SQL, $MAILER, $WEBHOOK);
59-
$_SESSION["is_admin"] = $OPERATOR->getModifier("admin");
59+
$_SESSION["is_admin"] = $OPERATOR->getFlag("admin");
6060

6161
if (isset($_SESSION["viewUser"]) && $_SESSION["is_admin"]) {
6262
$USER = new UnityUser($_SESSION["viewUser"], $LDAP, $SQL, $MAILER, $WEBHOOK);

‎resources/lib/UnityGroup.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function approveGroup(?UnityUser $operator = null, bool $send_mail = true
8585
if ($send_mail) {
8686
$this->MAILER->sendMail($this->getOwner()->getMail(), "group_created");
8787
}
88-
$this->getOwner()->setModifier("qualified", true); // having your own group makes you qualified
88+
$this->getOwner()->setFlag("qualified", true); // having your own group makes you qualified
8989
}
9090

9191
/**
@@ -192,7 +192,7 @@ public function approveUser(UnityUser $new_user, bool $send_mail = true): void
192192
]);
193193
}
194194
// being in a group makes you qualified
195-
$new_user->setModifier("qualified", true, doSendMail: true, doSendMailAdmin: false);
195+
$new_user->setFlag("qualified", true, doSendMail: true, doSendMailAdmin: false);
196196
}
197197

198198
public function denyUser(UnityUser $new_user, bool $send_mail = true): void

‎resources/lib/UnityLDAP.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class UnityLDAP extends LDAPConn
3737
private LDAPEntry $pi_groupOU;
3838
private LDAPEntry $org_groupOU;
3939

40-
public array $userModifierGroups;
40+
public array $userFlagGroups;
4141

4242
public function __construct()
4343
{
@@ -47,9 +47,9 @@ public function __construct()
4747
$this->groupOU = $this->getEntry(CONFIG["ldap"]["group_ou"]);
4848
$this->pi_groupOU = $this->getEntry(CONFIG["ldap"]["pigroup_ou"]);
4949
$this->org_groupOU = $this->getEntry(CONFIG["ldap"]["orggroup_ou"]);
50-
$this->userModifierGroups = [];
51-
foreach (CONFIG["ldap"]["user_modifier_groups"] as $gid => $dn) {
52-
$this->userModifierGroups[$gid] = new PosixGroup(new LDAPEntry($this->conn, $dn));
50+
$this->userFlagGroups = [];
51+
foreach (CONFIG["ldap"]["user_flag_groups"] as $gid => $dn) {
52+
$this->userFlagGroups[$gid] = new PosixGroup(new LDAPEntry($this->conn, $dn));
5353
}
5454
}
5555

@@ -184,7 +184,7 @@ public function getQualifiedUsersAttributes(
184184
array $attributes,
185185
array $default_values = [],
186186
): array {
187-
$include_uids = $this->userModifierGroups["qualified"]->getMemberUIDs();
187+
$include_uids = $this->userFlagGroups["qualified"]->getMemberUIDs();
188188
$user_attributes = $this->baseOU->getChildrenArrayStrict(
189189
$attributes,
190190
true, // recursive
@@ -281,7 +281,7 @@ public function getAllPIGroupOwnerAttributes(
281281
public function getQualifiedUID2PIGIDs(): array
282282
{
283283
// initialize output so each UID is a key with an empty array as its value
284-
$uids = $this->userModifierGroups["qualified"]->getMemberUIDs();
284+
$uids = $this->userFlagGroups["qualified"]->getMemberUIDs();
285285
$uid2pigids = array_combine($uids, array_fill(0, count($uids), []));
286286
// for each PI group, append that GID to the member list for each of its member UIDs
287287
foreach (

‎resources/lib/UnityUser.php‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -97,51 +97,51 @@ public function init(
9797
$this->SQL->addLog($this->uid, $_SERVER["REMOTE_ADDR"], "user_added", $this->uid);
9898
}
9999

100-
public function getModifier(string $modifier): bool
100+
public function getFlag(string $flag): bool
101101
{
102-
return $this->LDAP->userModifierGroups[$modifier]->memberUIDExists($this->uid);
102+
return $this->LDAP->userFlagGroups[$flag]->memberUIDExists($this->uid);
103103
}
104104

105-
public function setModifier(
106-
string $modifier,
105+
public function setFlag(
106+
string $flag,
107107
bool $newValue,
108108
bool $doSendMail = true,
109109
bool $doSendMailAdmin = true,
110110
): void {
111-
$oldValue = $this->getModifier($modifier);
111+
$oldValue = $this->getFlag($flag);
112112
if ($oldValue == $newValue) {
113113
return;
114114
}
115115
if ($newValue) {
116-
$this->LDAP->userModifierGroups[$modifier]->addMemberUID($this->uid);
116+
$this->LDAP->userFlagGroups[$flag]->addMemberUID($this->uid);
117117
if ($doSendMail) {
118-
$this->MAILER->sendMail($this->getMail(), "user_modifier_added", [
118+
$this->MAILER->sendMail($this->getMail(), "user_flag_added", [
119119
"user" => $this->uid,
120120
"org" => $this->getOrg(),
121-
"modifier" => $modifier,
121+
"flag" => $flag,
122122
]);
123123
}
124124
if ($doSendMailAdmin) {
125-
$this->MAILER->sendMail("admin", "user_modifier_added_admin", [
125+
$this->MAILER->sendMail("admin", "user_flag_added_admin", [
126126
"user" => $this->uid,
127127
"org" => $this->getOrg(),
128-
"modifier" => $modifier,
128+
"flag" => $flag,
129129
]);
130130
}
131131
} else {
132-
$this->LDAP->userModifierGroups[$modifier]->removeMemberUID($this->uid);
132+
$this->LDAP->userFlagGroups[$flag]->removeMemberUID($this->uid);
133133
if ($doSendMail) {
134-
$this->MAILER->sendMail($this->getMail(), "user_modifier_removed", [
134+
$this->MAILER->sendMail($this->getMail(), "user_flag_removed", [
135135
"user" => $this->uid,
136136
"org" => $this->getOrg(),
137-
"modifier" => $modifier,
137+
"flag" => $flag,
138138
]);
139139
}
140140
if ($doSendMailAdmin) {
141-
$this->MAILER->sendMail("admin", "user_modifier_removed_admin", [
141+
$this->MAILER->sendMail("admin", "user_flag_removed_admin", [
142142
"user" => $this->uid,
143143
"org" => $this->getOrg(),
144-
"modifier" => $modifier,
144+
"flag" => $flag,
145145
]);
146146
}
147147
}

resources/mail/user_modifier_added.php renamed to resources/mail/user_flag_added.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php switch ($data["modifier"]):
1+
<?php switch ($data["flag"]):
22
case "qualified": ?>
33
<?php $this->Subject = "User Activated"; ?>
44
<p>Hello,</p>
@@ -50,5 +50,5 @@
5050

5151
<?php /////////////////////////////////////////////////////////////////////////////////////////// ?>
5252
<?php default: ?>
53-
<?php throw new \Exception("unknown modifier: " . $data["modifier"]); ?>
53+
<?php throw new \Exception("unknown flag: " . $data["flag"]); ?>
5454
<?php endswitch; ?>

resources/mail/user_modifier_added_admin.php renamed to resources/mail/user_flag_added_admin.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php switch ($data["modifier"]):
1+
<?php switch ($data["flag"]):
22
case "qualified": ?>
33
<?php $this->Subject = "User Qualified"; ?>
44
<p>Hello,</p>
@@ -35,5 +35,5 @@
3535

3636
<?php /////////////////////////////////////////////////////////////////////////////////////////// ?>
3737
<?php default: ?>
38-
<?php throw new \Exception("unknown modifier: " . $data["modifier"]); ?>
38+
<?php throw new \Exception("unknown flag: " . $data["flag"]); ?>
3939
<?php endswitch; ?>

resources/mail/user_modifier_removed.php renamed to resources/mail/user_flag_removed.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php switch ($data["modifier"]):
1+
<?php switch ($data["flag"]):
22
case "qualified": ?>
33
<?php $this->Subject = "User Deactivated"; ?>
44
<p>Hello,</p>
@@ -40,5 +40,5 @@
4040

4141
<?php /////////////////////////////////////////////////////////////////////////////////////////// ?>
4242
<?php default: ?>
43-
<?php throw new \Exception("unknown modifier: " . $data["modifier"]); ?>
43+
<?php throw new \Exception("unknown flag: " . $data["flag"]); ?>
4444
<?php endswitch; ?>

resources/mail/user_modifier_removed_admin.php renamed to resources/mail/user_flag_removed_admin.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php switch ($data["modifier"]):
1+
<?php switch ($data["flag"]):
22
case "qualified": ?>
33
<?php $this->Subject = "User Dequalified"; ?>
44
<p>Hello,</p>
@@ -35,5 +35,5 @@
3535

3636
<?php /////////////////////////////////////////////////////////////////////////////////////////// ?>
3737
<?php default: ?>
38-
<?php throw new \Exception("unknown modifier: " . $data["modifier"]); ?>
38+
<?php throw new \Exception("unknown flag: " . $data["flag"]); ?>
3939
<?php endswitch; ?>

0 commit comments

Comments
 (0)