Skip to content

Feature optional suspendusername #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elke-hsh wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature optional suspendusername #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0858a2e
Make suspendusername optional
elke-hsh Apr 30, 2025
d55cf12
Add condition to exclude active users.
elke-hsh May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions classes/archiveduser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,8 @@ public function delete_me() {
}

/**
* Creates an empty user with ':suspendusername + id' as username and ':suspendfirstname' as Firstname.
* Creates an empty user with optional ':suspendusername + id' as username if set, ':suspendfirstname' as Firstname
* and ':suspendlastname' as Lastname.
*
* @param int $id
* @param int $timestamp
Expand All @@ -220,8 +221,11 @@ public function delete_me() {
private function give_suspended_pseudo_user($id, $timestamp) {
$cloneuser = new \stdClass();
$cloneuser->id = $id;
// Usernames have to be unique therefore the id is used.
$cloneuser->username = get_config('tool_cleanupusers_settings', 'suspendusername') . $id;
$suspendusername = get_config('tool_cleanupusers_settings', 'suspendusername');
if (!$suspendusername == '') {
// Usernames have to be unique therefore the id is used.
$cloneuser->username = $suspendusername . $id;
};
$cloneuser->firstname = get_config('tool_cleanupusers_settings', 'suspendfirstname');
$cloneuser->lastname = get_config('tool_cleanupusers_settings', 'suspendlastname');
$cloneuser->suspended = 1;
Expand Down
4 changes: 2 additions & 2 deletions lang/en/tool_cleanupusers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@
$string['sett_suspendfirstname_description'] = 'Choose a firstname for suspended users';
$string['sett_suspendlastname_description'] = 'Choose a lastname for suspended users';
$string['sett_suspendusername'] = 'Username for suspended';
$string['sett_suspendusername_description'] = 'Choose a username for suspended users (must be lowercase)';
$string['sett_suspendusername_description'] = 'Choose a username for suspended users (must be lowercase), No setting leaves username unchanged.';
$string['sett_title'] = 'Configure suspended users';
$string['shouldbedelted'] = 'will be deleted in the next cron-job';
$string['showuser'] = 'Activate User';
$string['subplugintype_userstatus'] = 'Returns the status of users';
$string['subplugintype_userstatus_plural'] = 'Returns the status of users';
$string['suspendfirstname'] = 'Anonym';
$string['suspendlastname'] = 'Anonym';
$string['suspendusername'] = 'anonym';
$string['suspendusername'] = '';
$string['toarchive'] = 'Manage users who will be archived';
$string['todelete'] = 'Manage users who will be deleted';
$string['usersarchived'] = 'The Users have been archived';
Expand Down
2 changes: 1 addition & 1 deletion userstatus/timechecker/classes/timechecker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public function get_to_reactivate() {
AND u.deleted = 0
AND tca.lastaccess >= :timelimit
AND tca.username NOT IN
(SELECT username FROM {user} WHERE username IS NOT NULL)",
(SELECT username FROM {user} WHERE username IS NOT NULL AND suspended=0)",
[
'timelimit' => time() - $this->timesuspend,
]
Expand Down