diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-03-22 18:15:10 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-03-22 18:15:10 +0100 |
| commit | cc13bac412442a1d72affcc3222b6bfca094e92a (patch) | |
| tree | 52bb477441ad8eea535681910ed15cebcc9cfca9 /phpBB/includes/functions_user.php | |
| parent | 81310f93517d50d27196b6aa1051ad3b87b5e689 (diff) | |
| parent | 57eb50812f138296085b51b74079037c2efe1c43 (diff) | |
| download | forums-cc13bac412442a1d72affcc3222b6bfca094e92a.tar forums-cc13bac412442a1d72affcc3222b6bfca094e92a.tar.gz forums-cc13bac412442a1d72affcc3222b6bfca094e92a.tar.bz2 forums-cc13bac412442a1d72affcc3222b6bfca094e92a.tar.xz forums-cc13bac412442a1d72affcc3222b6bfca094e92a.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10684] Adjust function and parameter name, minor changes.
[ticket/10684] Rename function phpbb_get_banned_users_ids() parameter
[ticket/10684] Remove intval mapping for array keys
[ticket/10684] Adjust pm_notifications() to handle stale bans
[ticket/10684] Cast user_id to integer
[ticket/10684] Refactor $sql_ignore_users array update
[ticket/10684] Remove isset() for $sql_ignore_users update
[ticket/10684] Fix 2 typos in comment lines.
[ticket/10684] Send notifications for users with stale bans
Conflicts:
phpBB/includes/functions_user.php
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 509e1a953c..18452c27e9 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -3691,3 +3691,36 @@ function remove_newly_registered($user_id, $user_data = false) return $user_data['group_id']; } + +/** +* Gets user ids of currently banned registered users. +* +* @param array $user_ids Array of users' ids to check for banning, +* leave empty to get complete list of banned ids +* @return array Array of banned users' ids if any, empty array otherwise +*/ +function phpbb_get_banned_user_ids($user_ids = array()) +{ + global $db; + + $sql_user_ids = (!empty($user_ids)) ? $db->sql_in_set('ban_userid', $user_ids) : 'ban_userid <> 0'; + + // Get banned User ID's + // Ignore stale bans which were not wiped yet + $banned_ids_list = array(); + $sql = 'SELECT ban_userid + FROM ' . BANLIST_TABLE . " + WHERE $sql_user_ids + AND ban_exclude <> 1 + AND (ban_end > " . time() . ' + OR ban_end = 0)'; + $result = $db->sql_query($sql); + while ($row = $db->sql_fetchrow($result)) + { + $user_id = (int) $row['ban_userid']; + $banned_ids_list[$user_id] = $user_id; + } + $db->sql_freeresult($result); + + return $banned_ids_list; +} |