|
52 | 52 |
|
53 | 53 | if (!empty($added_keys)) { |
54 | 54 | $added_keys = UnitySite::removeTrailingWhitespace($added_keys); |
55 | | - $totalKeys = array_merge($USER->getSSHKeys(), $added_keys); |
| 55 | + $totalKeys = array_merge($USER->getSSHKeys(true), $added_keys); |
56 | 56 | $USER->setSSHKeys($totalKeys, $OPERATOR); |
57 | 57 | } |
58 | 58 | break; |
59 | 59 | case "delKey": |
60 | | - $keys = $USER->getSSHKeys(); |
| 60 | + $keys = $USER->getSSHKeys(true); |
61 | 61 | unset($keys[intval($_POST["delIndex"])]); // remove key from array |
62 | 62 | $keys = array_values($keys); |
63 | 63 |
|
|
78 | 78 | } |
79 | 79 | break; |
80 | 80 | case "account_deletion_request": |
81 | | - $hasGroups = count($USER->getGroups()) > 0; |
| 81 | + $hasGroups = count($USER->getGroups(true)) > 0; |
82 | 82 | if ($hasGroups) { |
83 | 83 | die(); |
84 | 84 | break; |
|
99 | 99 | <p> |
100 | 100 | <strong>Username</strong> <code><?php echo $USER->getUID(); ?></code> |
101 | 101 | <br> |
102 | | - <strong>Organization</strong> <code><?php echo $USER->getOrg(); ?></code> |
| 102 | + <strong>Organization</strong> <code><?php echo $USER->getOrg(true); ?></code> |
103 | 103 | <br> |
104 | | - <strong>Email</strong> <code><?php echo $USER->getMail(); ?></code> |
| 104 | + <strong>Email</strong> <code><?php echo $USER->getMail(true); ?></code> |
105 | 105 | </p> |
106 | 106 |
|
107 | 107 | <hr> |
|
110 | 110 |
|
111 | 111 | <?php |
112 | 112 |
|
113 | | -$isActive = count($USER->getGroups()) > 0; |
| 113 | +$isActive = count($USER->getGroups(true)) > 0; |
114 | 114 | $isPI = $USER->isPI(); |
115 | 115 |
|
116 | 116 | if ($isPI) { |
|
156 | 156 |
|
157 | 157 | <h5>SSH Keys</h5> |
158 | 158 | <?php |
159 | | -$sshPubKeys = $USER->getSSHKeys(); // Get ssh public key attr |
| 159 | +$sshPubKeys = $USER->getSSHKeys(true); // Get ssh public key attr |
160 | 160 |
|
161 | 161 | if (count($sshPubKeys) == 0) { |
162 | 162 | echo "<p>You do not have any SSH public keys, press the button below to add one.</p>"; |
|
190 | 190 | <option value="" disabled hidden>Select Login Shell...</option> |
191 | 191 |
|
192 | 192 | <?php |
193 | | - $cur_shell = $USER->getLoginShell(); |
| 193 | + $cur_shell = $USER->getLoginShell(true); |
194 | 194 | $found_selector = false; |
195 | 195 | foreach ($CONFIG["loginshell"]["shell"] as $shell) { |
196 | 196 | if ($cur_shell == $shell) { |
|
229 | 229 |
|
230 | 230 | <h5>Account Deletion</h5> |
231 | 231 | <?php |
232 | | -$hasGroups = count($USER->getGroups()) > 0; |
| 232 | +$hasGroups = count($USER->getGroups(true)) > 0; |
233 | 233 |
|
234 | 234 | if ($hasGroups) { |
235 | 235 | echo "<p>You cannot request to delete your account while you are in a PI group.</p>"; |
|
0 commit comments