makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/prune-users] Call sql_is_set once for author ids in user_delete.

Browse source 
PHPBB3-9622
This commit is contained in:
Oleg Pudeyev 2011-05-08 13:16:15 -04:00
parent 0f17d5d493
commit f65556e6de
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/includes/functions_user.php
View file

@ -537,6 +537,8 @@ function user_delete($mode, $user_ids, $retain_username = true)
$cache->destroy('sql', MODERATOR_CACHE_TABLE); $cache->destroy('sql', MODERATOR_CACHE_TABLE);
$author_id_sql = $db->sql_in_set('author_id', $user_ids);
// Delete user log entries about this user // Delete user log entries about this user
$sql = 'DELETE FROM ' . LOG_TABLE . ' $sql = 'DELETE FROM ' . LOG_TABLE . '
WHERE ' . $user_id_sql; //reportee_id = ' . $user_id; WHERE ' . $user_id_sql; //reportee_id = ' . $user_id;
@ -567,7 +569,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
// Remove any undelivered mails... // Remove any undelivered mails...
$sql = 'SELECT msg_id, user_id $sql = 'SELECT msg_id, user_id
FROM ' . PRIVMSGS_TO_TABLE . ' FROM ' . PRIVMSGS_TO_TABLE . '
WHERE ' . $db->sql_in_set('author_id', $user_ids) . ' WHERE ' . $author_id_sql . '
AND folder_id = ' . PRIVMSGS_NO_BOX; AND folder_id = ' . PRIVMSGS_NO_BOX;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -587,7 +589,7 @@ function user_delete($mode, $user_ids, $retain_username = true)
} }
$sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . ' $sql = 'DELETE FROM ' . PRIVMSGS_TO_TABLE . '
WHERE ' . $db->sql_in_set('author_id', $user_ids) . ' WHERE ' . $author_id_sql . '
AND folder_id = ' . PRIVMSGS_NO_BOX; AND folder_id = ' . PRIVMSGS_NO_BOX;
$db->sql_query($sql); $db->sql_query($sql);
@ -599,12 +601,12 @@ function user_delete($mode, $user_ids, $retain_username = true)
// Set the remaining author id to anonymous - this way users are still able to read messages from users being removed // Set the remaining author id to anonymous - this way users are still able to read messages from users being removed
$sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . ' $sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . '
SET author_id = ' . ANONYMOUS . ' SET author_id = ' . ANONYMOUS . '
WHERE ' . $db->sql_in_set('author_id', $user_ids); WHERE ' . $author_id_sql;
$db->sql_query($sql); $db->sql_query($sql);
$sql = 'UPDATE ' . PRIVMSGS_TABLE . ' $sql = 'UPDATE ' . PRIVMSGS_TABLE . '
SET author_id = ' . ANONYMOUS . ' SET author_id = ' . ANONYMOUS . '
WHERE ' . $db->sql_in_set('author_id', $user_ids); WHERE ' . $author_id_sql;
$db->sql_query($sql); $db->sql_query($sql);
foreach ($undelivered_user as $_user_id => $ary) foreach ($undelivered_user as $_user_id => $ary)