friendica/friendica
6
2
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-09-07 19:11:51 +02:00
Code Issues Projects Releases 3 Packages Wiki Activity

Merge pull request #6198 from MrPetovan/task/user-removal-improvements

Browse source 
User removal improvements
This commit is contained in:
Tobias Diekershoff 2018-11-25 08:45:45 +01:00 • committed by GitHub
commit 8fda63ca86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
mod/admin.php
View file

@ -1783,7 +1783,11 @@ function admin_page_users_post(App $a)
}
if (x($_POST, 'page_users_delete')) {
foreach ($users as $uid) {
User::remove($uid);
if (local_user() != $uid) {
User::remove($uid);
} else {
notice(L10n::t('You can\'t remove yourself'));
}
}
notice(L10n::tt("%s user deleted", "%s users deleted", count($users)));
}
@ -1828,11 +1832,15 @@ function admin_page_users(App $a)
}
switch ($a->argv[2]) {
case "delete":
BaseModule::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');
// delete user
User::remove($uid);
if (local_user() != $uid) {
BaseModule::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');
// delete user
User::remove($uid);
notice(L10n::t("User '%s' deleted", $user['username']) . EOL);
notice(L10n::t("User '%s' deleted", $user['username']));
} else {
notice(L10n::t('You can\'t remove yourself'));
}
break;
case "block":
BaseModule::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't');

6
mod/removeme.php
View file

@ -57,8 +57,12 @@ function removeme_post(App $a)
]);
}
if (User::authenticate($a->user, trim($_POST['qxz_password']))) {
if (User::getIdFromPasswordAuthentication($a->user, trim($_POST['qxz_password']))) {
User::remove($a->user['uid']);
unset($_SESSION['authenticated']);
unset($_SESSION['uid']);
$a->internalRedirect();
// NOTREACHED
}
}