diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-10-08 16:53:14 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-10-08 16:53:14 +0200 |
| commit | 5f117bcb5e35cb127ead0e38950af8120983a8eb (patch) | |
| tree | 7460017f724b4a2d18c6b62dc2438878043ac6ac /phpBB/memberlist.php | |
| parent | 0c0e43e110a9f4f42ca7b5fa109c608424781edd (diff) | |
| parent | 6360d748db655e615c0faec1cf939d7cfbe60600 (diff) | |
| download | forums-5f117bcb5e35cb127ead0e38950af8120983a8eb.tar forums-5f117bcb5e35cb127ead0e38950af8120983a8eb.tar.gz forums-5f117bcb5e35cb127ead0e38950af8120983a8eb.tar.bz2 forums-5f117bcb5e35cb127ead0e38950af8120983a8eb.tar.xz forums-5f117bcb5e35cb127ead0e38950af8120983a8eb.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/memberlist.php')
| -rw-r--r-- | phpBB/memberlist.php | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index eaaae4aaab..b167e0e7dc 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1027,6 +1027,23 @@ switch ($mode) FROM ' . POSTS_TABLE . ' WHERE poster_ip ' . ((strpos($ips, '%') !== false) ? 'LIKE' : 'IN') . " ($ips) AND " . $db->sql_in_set('forum_id', $ip_forums); + + /** + * Modify sql query for members search by ip address / hostname + * + * @event core.memberlist_modify_ip_search_sql_query + * @var string ipdomain The host name + * @var string ips IP address list for the given host name + * @var string sql The SQL query for searching members by IP address + * @since 3.1.7-RC1 + */ + $vars = array( + 'ipdomain', + 'ips', + 'sql', + ); + extract($phpbb_dispatcher->trigger_event('core.memberlist_modify_ip_search_sql_query', compact($vars))); + $result = $db->sql_query($sql); if ($row = $db->sql_fetchrow($result)) @@ -1167,6 +1184,32 @@ switch ($mode) $order_by .= ', u.user_posts DESC'; } + /** + * Modify sql query data for members search + * + * @event core.memberlist_modify_sql_query_data + * @var string order_by SQL ORDER BY clause condition + * @var string sort_dir The sorting direction + * @var string sort_key The sorting key + * @var array sort_key_sql Arraty with the sorting conditions data + * @var string sql_from SQL FROM clause condition + * @var string sql_select SQL SELECT fields list + * @var string sql_where SQL WHERE clause condition + * @var string sql_where_data SQL WHERE clause additional conditions data + * @since 3.1.7-RC1 + */ + $vars = array( + 'order_by', + 'sort_dir', + 'sort_key', + 'sort_key_sql', + 'sql_from', + 'sql_select', + 'sql_where', + 'sql_where_data', + ); + extract($phpbb_dispatcher->trigger_event('core.memberlist_modify_sql_query_data', compact($vars))); + // Count the users ... if ($sql_where) { |