diff --git a/phpBB/admin/admin_ban.php b/phpBB/admin/admin_ban.php index 058e32102f..8f3cb6abf1 100644 --- a/phpBB/admin/admin_ban.php +++ b/phpBB/admin/admin_ban.php @@ -406,7 +406,7 @@ switch ($mode) $l_unban_explain = $user->lang['Unban_username_explain']; $l_ban_cell = $user->lang['Username']; $l_no_ban_cell = $user->lang['No_banned_users']; - $s_submit_extra = ''; + $s_submit_extra = ''; break; diff --git a/phpBB/admin/admin_permissions.php b/phpBB/admin/admin_permissions.php index 048e8bf52b..8f8763a534 100644 --- a/phpBB/admin/admin_permissions.php +++ b/phpBB/admin/admin_permissions.php @@ -289,7 +289,7 @@ if (!empty($forum_id) || $mode == 'administrators' || $mode == 'supermoderators' -     &mode=searchuser&form=2&field=entries', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=650');return false;" /> +     &mode=searchuser&form=2&field=entries', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" /> diff --git a/phpBB/admin/admin_users.php b/phpBB/admin/admin_users.php index dde955e3ca..772b98f04d 100644 --- a/phpBB/admin/admin_users.php +++ b/phpBB/admin/admin_users.php @@ -307,7 +307,7 @@ page_header($user->lang['Manage']); lang['Select_a_User']; ?> - ', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=650');return false;" /> + ', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" /> diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index ab8da450c8..33937bf777 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -30,175 +30,186 @@ $user->setup(); $auth->acl($user->data); // End session management -$start = ( isset($_GET['start']) ) ? intval($_GET['start']) : 0; -$form = ( !empty($_GET['form']) ) ? $_GET['form'] : 0; -$field = ( isset($_GET['field']) ) ? $_GET['field'] : 'username'; +// Grab data +$mode = (isset($_REQUEST['mode'])) ? $_REQUEST['mode'] : ''; -$sort_by = ( !empty($_POST['sort_by']) ) ? intval($_POST['sort_by']) : ( ( !empty($_GET['sort_by']) ) ? $_GET['sort_by'] : '4' ); -$sort_order = ( !empty($_POST['sort_order']) ) ? $_POST['sort_order'] : ( ( !empty($_GET['sort_order']) ) ? $_GET['sort_order'] : 'd' ); +$start = (isset($_GET['start'])) ? intval($_GET['start']) : 0; +$form = (!empty($_GET['form'])) ? $_GET['form'] : 0; +$field = (isset($_GET['field'])) ? $_GET['field'] : 'username'; -$username = ( !empty($_POST['username']) ) ? $_POST['username'] : ( ( !empty($_GET['username']) ) ? $_GET['username'] : '' ); -$email = ( !empty($_POST['email']) ) ? $_POST['email'] : ( ( !empty($_GET['email']) ) ? $_GET['email'] : '' ); -$icq = ( !empty($_POST['icq']) ) ? intval($_POST['icq']) : ( ( !empty($_GET['icq']) ) ? $_GET['icq'] : '' ); -$aim = ( !empty($_POST['aim']) ) ? $_POST['aim'] : ( ( !empty($_GET['aim']) ) ? $_GET['aim'] : '' ); -$yahoo = ( !empty($_POST['yahoo']) ) ? $_POST['yahoo'] : ( ( !empty($_GET['yahoo']) ) ? $_GET['yahoo'] : '' ); -$msn = ( !empty($_POST['msn']) ) ? $_POST['msn'] : ( ( !empty($_GET['msn']) ) ? $_GET['msn'] : '' ); +$sort_key = (!empty($_REQUEST['sort_key'])) ? intval($_REQUEST['sort_key']) : 0; +$sort_dir = (!empty($_REQUEST['sort_dir'])) ? $_REQUEST['sort_dir'] : 'd'; -$joined_select = ( !empty($_POST['joined_select']) ) ? $_POST['joined_select'] : ( ( !empty($_GET['joined_select']) ) ? $_GET['joined_select'] : 'lt' ); -$active_select = ( !empty($_POST['active_select']) ) ? $_POST['active_select'] : ( ( !empty($_GET['active_select']) ) ? $_GET['active_select'] : 'lt' ); -$count_select = ( !empty($_POST['count_select']) ) ? $_POST['count_select'] : ( ( !empty($_GET['count_select']) ) ? $_GET['count_select'] : 'eq' ); -$joined = ( !empty($_POST['joined']) ) ? explode('-', $_POST['joined']) : ( ( !empty($_GET['joined']) ) ? explode('-', $_GET['joined']) : array() ); -$active = ( !empty($_POST['active']) ) ? explode('-', $_POST['active']) : ( ( !empty($_GET['active']) ) ? explode('-', $_GET['active']) : array() ); -$count = ( !empty($_POST['count']) ) ? intval($_POST['count']) : ( ( !empty($_GET['count']) ) ? $_GET['count'] : '' ); +$username = (!empty($_REQUEST['username'])) ? $_REQUEST['username'] : ''; +$email = (!empty($_REQUEST['email'])) ? $_REQUEST['email'] : ''; +$icq = (!empty($_REQUEST['icq'])) ? intval($_REQUEST['icq']) : ''; +$aim = (!empty($_REQUEST['aim'])) ? $_REQUEST['aim'] : ''; +$yahoo = (!empty($_REQUEST['yahoo'])) ? $_REQUEST['yahoo'] : ''; +$msn = (!empty($_REQUEST['msn'])) ? $_REQUEST['msn'] : ''; +$joined_select = (!empty($_REQUEST['joined_select'])) ? $_REQUEST['joined_select'] : 'lt'; +$active_select = (!empty($_REQUEST['active_select'])) ? $_REQUEST['active_select'] : 'lt'; +$count_select = (!empty($_REQUEST['count_select'])) ? $_REQUEST['count_select'] : 'eq'; +$joined = (!empty($_REQUEST['joined'])) ? explode('-', $_REQUEST['joined']) : array(); +$active = (!empty($_REQUEST['active'])) ? explode('-', $_REQUEST['active']) : array(); +$count = (!empty($_REQUEST['count'])) ? intval($_REQUEST['count']) : ''; - - - -if ( isset($_POST['order']) ) -{ - $sort_order = ($_POST['order'] == 'a') ? 'ASC' : 'DESC'; -} -else if ( isset($_GET['order']) ) -{ - $sort_order = ($_GET['order'] == 'a') ? 'ASC' : 'DESC'; -} -else -{ - $sort_order = 'ASC'; -} - -// // Memberlist sorting -// -$mode_types_text = array($user->lang['Sort_Joined'], $user->lang['Sort_Username'], $user->lang['Sort_Location'], $user->lang['Sort_Posts'], $user->lang['Sort_Email'], $user->lang['Sort_Website'], $user->lang['Sort_Top_Ten']); -$mode_types = array('joindate', 'username', 'location', 'posts', 'email', 'website', 'topten'); - -$select_sort_mode = ''; +for($i = 0; $i < count($sort_key_text); $i++) { - $selected = ( $mode == $mode_types[$i] ) ? ' selected="selected"' : ''; - $select_sort_mode .= ''; + $selected = ($sort_key == $i) ? ' selected="selected"' : ''; + $s_sort_key .= ''; } -$select_sort_mode .= ''; +$s_sort_key .= ''; -$select_sort_order = ''; - -if ( $mode != 'topten' || $config['topics_per_page'] < 10 ) +$sort_dir_text = array('a' => $user->lang['Ascending'], 'd' => $user->lang['Descending']); +$s_sort_dir = ''; + +// Clear var for where sql +$where_sql = ''; + +// Additional sorting options for user search +if ($mode == 'searchuser') { - $pagination = ' '; - $total_members = 10; -} + $find_key_match = array('lt' => '<', 'gt' => '>', 'eq' => '='); -// -// Generate page -// -$template->assign_vars(array( - 'PAGINATION' => $pagination, - 'PAGE_NUMBER' => sprintf($user->lang['Page_of'], ( floor( $start / $config['topics_per_page'] ) + 1 ), ceil( $total_members / $config['topics_per_page'] )), - - 'L_SELECT_SORT_METHOD' => $user->lang['Select_sort_method'], - 'L_EMAIL' => $user->lang['Email'], - 'L_WEBSITE' => $user->lang['Website'], - 'L_FROM' => $user->lang['Location'], - 'L_ORDER' => $user->lang['Order'], - 'L_SORT' => $user->lang['Sort'], - 'L_SUBMIT' => $user->lang['Sort'], - 'L_AIM' => $user->lang['AIM'], - 'L_YIM' => $user->lang['YIM'], - 'L_MSNM' => $user->lang['MSNM'], - 'L_ICQ' => $user->lang['ICQ'], - 'L_JOINED' => $user->lang['Joined'], - 'L_POSTS' => $user->lang['Posts'], - 'L_GOTO_PAGE' => $user->lang['Goto_page'], - - 'S_MODE_SELECT' => $select_sort_mode, - 'S_ORDER_SELECT' => $select_sort_order, - 'S_MODE_ACTION' => "memberlist.$phpEx$SID") -); - -if ( isset($_GET['mode']) || isset($_POST['mode']) ) -{ - $mode = ( isset($_POST['mode']) ) ? $_POST['mode'] : $_GET['mode']; - - switch( $mode ) + $find_count = array('lt' => $user->lang['Less_than'], 'eq' => $user->lang['Equal_to'], 'gt' => $user->lang['More_than']); + $s_find_count = ''; + foreach ($find_count as $key => $value) { - case 'topten': - $order_by = "user_posts DESC LIMIT 10"; - break; - case 'joined': - $order_by = "user_regdate ASC LIMIT $start, " . $config['topics_per_page']; - break; - case 'username': - $order_by = "username $sort_order LIMIT $start, " . $config['topics_per_page']; - break; - case 'location': - $order_by = "user_from $sort_order LIMIT $start, " . $config['topics_per_page']; - break; - case 'posts': - $order_by = "user_posts $sort_order LIMIT $start, " . $config['topics_per_page']; - break; - case 'email': - $order_by = "user_email $sort_order LIMIT $start, " . $config['topics_per_page']; - break; - case 'website': - $order_by = "user_website $sort_order LIMIT $start, " . $config['topics_per_page']; - break; - default: - $order_by = "user_regdate $sort_order LIMIT $start, " . $config['topics_per_page']; - break; + $selected = ($count_select == $key) ? ' selected="selected"' : ''; + $s_find_count .= ''; } -} -else -{ - $order_by = "user_regdate $sort_order LIMIT $start, " . $config['topics_per_page']; + + $find_time = array('lt' => $user->lang['Before'], 'gt' => $user->lang['After']); + $s_find_join_time = ''; + foreach ($find_time as $key => $value) + { + $selected = ($joined_select == $key) ? ' selected="selected"' : ''; + $s_find_join_time .= ''; + } + $s_find_active_time = ''; + foreach ($find_time as $key => $value) + { + $selected = ($active_select == $key) ? ' selected="selected"' : ''; + $s_find_active_time .= ''; + } + + $where_sql .= ($username) ? " AND username LIKE '" . str_replace('*', '%', sql_quote($username)) ."'" : ''; + $where_sql .= ($email) ? " AND user_email LIKE '" . str_replace('*', '%', sql_quote($email)) ."' " : ''; + $where_sql .= ($icq) ? " AND user_icq LIKE '" . str_replace('*', '%', sql_quote($icq)) ."' " : ''; + $where_sql .= ($aim) ? " AND user_aim LIKE '" . str_replace('*', '%', sql_quote($aim)) ."' " : ''; + $where_sql .= ($yahoo) ? " AND user_yim LIKE '" . str_replace('*', '%', sql_quote($yahoo)) ."' " : ''; + $where_sql .= ($msn) ? " AND user_msnm LIKE '" . str_replace('*', '%', sql_quote($msn)) ."' " : ''; + $where_sql .= ($joined) ? " AND user_regdate " . $find_key_match[$joined_select] . " " . gmmktime(0, 0, 0, intval($joined[1]), intval($joined[2]), intval($joined[0])) : ''; + $where_sql .= ($count) ? " AND user_posts " . $find_key_match[$count_select] . " $count " : ''; + $where_sql .= ($active) ? " AND user_lastvisit " . $find_key_match[$active_select] . " " . gmmktime(0, 0, 0, $active[1], intval($active[2]), intval($active[0])) : ''; + } -$sql = "SELECT username, user_id, user_viewemail, user_posts, user_regdate, user_from, user_website, user_email, user_icq, user_aim, user_yim, user_msnm, user_avatar, user_avatar_type, user_allowavatar +// Sorting and order +$order_by = $sort_key_fields[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC'); + +// Count the users ... +$sql = "SELECT COUNT(user_id) AS total_users FROM " . USERS_TABLE . " WHERE user_id <> " . ANONYMOUS . " - ORDER BY $order_by"; + $where_sql"; $result = $db->sql_query($sql); -if ( $row = $db->sql_fetchrow($result) ) +$total_users = ($row = $db->sql_fetchrow($result)) ? $row['total_users'] : 0; + +// Pagination string +$pagination_url = ($mode == 'searchuser') ? "memberlist.$phpEx$SID&mode=searchuser&form=$form&field=$field&username=" . urlencode($username) . "&email=" . urlencode($email) . "&icq=$icq&aim=" . urlencode($aim) . "&yahoo=" . urlencode($yahoo) . "&msn=" . urlencode($msn) . "&joined=" . urlencode(implode('-', $joined)) . "&active=" . urlencode(implode('-', $active)) . "&count=$count&sort_dir=$sort_dir&sort_key=$sort_key&joined_select=$joined_select&active_select=$active_select&count_select=$count_select" : "memberlist.$phpEx$SID&mode=$mode&sort_dir=$sort_dir"; + +// Some search user specific data +if ($mode == 'searchuser') +{ + $template->assign_vars(array( + 'USERNAME' => $username, + 'EMAIL' => $email, + 'ICQ' => $icq, + 'AIM' => $aim, + 'YAHOO' => $yahoo, + 'MSNM' => $msn, + 'JOINED' => implode('-', $joined), + 'ACTIVE' => implode('-', $active), + 'COUNT' => $count, + + 'L_SEARCH_USERNAME' => $user->lang['Find_username'], + 'L_SEARCH_EXPLAIN' => $user->lang['Find_username_explain'], + 'L_RESET' => $user->lang['Reset'], + 'L_ACTIVE' => $user->lang['Last_active'], + 'L_SORT_BY' => $user->lang['Sort_by'], + 'L_SORT_ASCENDING' => $user->lang['Sort_Ascending'], + 'L_SORT_DESCENDING' => $user->lang['Sort_Descending'], + 'L_SELECT_MARKED' => $user->lang['Select_marked'], + 'L_MARK' => $user->lang['Mark'], + 'L_MARK_ALL' => $user->lang['Mark_all'], + 'L_UNMARK_ALL' => $user->lang['Unmark_all'], + + 'S_SEARCH_USER' => true, + 'S_FORM_NAME' => $form, + 'S_FIELD_NAME' => $field, + 'S_COUNT_OPTIONS' => $s_find_count, + 'S_SORT_OPTIONS' => $s_sort_key, + 'S_USERNAME_OPTIONS'=> $username_list, + 'S_JOINED_TIME_OPTIONS' => $s_find_join_time, + 'S_ACTIVE_TIME_OPTIONS' => $s_find_active_time, + 'S_SEARCH_ACTION' => "memberslist.$phpEx$SID&mode=searchuser&field=$field") + ); +} + +// Do the SQL thang +$sql = "SELECT username, user_id, user_viewemail, user_posts, user_regdate, user_from, user_website, user_email, user_icq, user_aim, user_yim, user_msnm, user_avatar, user_avatar_type, user_allowavatar, user_lastvisit + FROM " . USERS_TABLE . " + WHERE user_id <> " . ANONYMOUS . " + $where_sql + ORDER BY $order_by + LIMIT $start, " . $config['topics_per_page']; +$result = $db->sql_query($sql); + +if ($row = $db->sql_fetchrow($result)) { $i = 0; do { $username = $row['username']; - $user_id = $row['user_id']; + $user_id = intval($row['user_id']); - $from = ( !empty($row['user_from']) ) ? $row['user_from'] : ' '; + $from = (!empty($row['user_from'])) ? $row['user_from'] : ' '; $joined = $user->format_date($row['user_regdate'], $user->lang['DATE_FORMAT']); - $posts = ( $row['user_posts'] ) ? $row['user_posts'] : 0; + $posts = ($row['user_posts']) ? $row['user_posts'] : 0; $poster_avatar = ''; - if ( $row['user_avatar_type'] && $user_id && $row['user_allowavatar'] ) + if ($row['user_avatar_type'] && $user_id && $row['user_allowavatar']) { - switch( $row['user_avatar_type'] ) + switch($row['user_avatar_type']) { case USER_AVATAR_UPLOAD: - $poster_avatar = ( $config['allow_avatar_upload'] ) ? '' : ''; + $poster_avatar = ($config['allow_avatar_upload']) ? '' : ''; break; case USER_AVATAR_REMOTE: - $poster_avatar = ( $config['allow_avatar_remote'] ) ? '' : ''; + $poster_avatar = ($config['allow_avatar_remote']) ? '' : ''; break; case USER_AVATAR_GALLERY: - $poster_avatar = ( $config['allow_avatar_local'] ) ? '' : ''; + $poster_avatar = ($config['allow_avatar_local']) ? '' : ''; break; } } - if ( $row['user_viewemail'] || $auth->acl_get('a_') ) + if ($row['user_viewemail'] || $auth->acl_get('a_')) { - $email_uri = ( $config['board_email_form'] ) ? "profile.$phpEx$SID&mode=email&u=" . $user_id : 'mailto:' . $row['user_email']; + $email_uri = ($config['board_email_form']) ? "profile.$phpEx$SID&mode=email&u=" . $user_id : 'mailto:' . $row['user_email']; $email_img = '' . $user->img('icon_email', $user->lang['Send_email']) . ''; $email = '' . $user->lang['Send_email'] . ''; @@ -217,10 +228,10 @@ if ( $row = $db->sql_fetchrow($result) ) $pm_img = '' . $user->img('icon_pm', $user->lang['Send_private_message']) . ''; $pm = '' . $user->lang['Send_private_message'] . ''; - $www_img = ( $row['user_website'] ) ? '' . $user->img('icon_www', $user->lang['Visit_website']) . '' : ''; - $www = ( $row['user_website'] ) ? '' . $user->lang['Visit_website'] . '' : ''; + $www_img = ($row['user_website']) ? '' . $user->img('icon_www', $user->lang['Visit_website']) . '' : ''; + $www = ($row['user_website']) ? '' . $user->lang['Visit_website'] . '' : ''; - if ( !empty($row['user_icq']) ) + if (!empty($row['user_icq'])) { $icq_status_img = ''; $icq_img = '' . $user->img('icon_icq', $user->lang['ICQ']) . ''; @@ -233,22 +244,22 @@ if ( $row = $db->sql_fetchrow($result) ) $icq = ''; } - $aim_img = ( $row['user_aim'] ) ? '' . $user->img('icon_aim', $user->lang['AIM']) . '' : ''; - $aim = ( $row['user_aim'] ) ? '' . $user->lang['AIM'] . '' : ''; + $aim_img = ($row['user_aim']) ? '' . $user->img('icon_aim', $user->lang['AIM']) . '' : ''; + $aim = ($row['user_aim']) ? '' . $user->lang['AIM'] . '' : ''; $temp_url = "profile.$phpEx$SID&mode=viewprofile&u=$user_id"; - $msn_img = ( $row['user_msnm'] ) ? '' . $user->img('icon_msnm', $user->lang['MSNM']) . '' : ''; - $msn = ( $row['user_msnm'] ) ? '' . $user->lang['MSNM'] . '' : ''; + $msn_img = ($row['user_msnm']) ? '' . $user->img('icon_msnm', $user->lang['MSNM']) . '' : ''; + $msn = ($row['user_msnm']) ? '' . $user->lang['MSNM'] . '' : ''; - $yim_img = ( $row['user_yim'] ) ? '' . $user->img('icon_yim', $user->lang['YIM']) . '' : ''; - $yim = ( $row['user_yim'] ) ? '' . $user->lang['YIM'] . '' : ''; + $yim_img = ($row['user_yim']) ? '' . $user->img('icon_yim', $user->lang['YIM']) . '' : ''; + $yim = ($row['user_yim']) ? '' . $user->lang['YIM'] . '' : ''; $temp_url = "search.$phpEx$SID&search_author=" . urlencode($username) . "&showresults=posts"; $search_img = '' . $user->img('icon_search', $user->lang['Search_user_posts']) . ''; $search = '' . $user->lang['Search_user_posts'] . ''; $template->assign_block_vars('memberrow', array( - 'ROW_NUMBER' => $i + ( $start + 1 ), + 'ROW_NUMBER' => $i + ($start + 1), 'USERNAME' => $username, 'FROM' => $from, 'JOINED' => $joined, @@ -273,6 +284,7 @@ if ( $row = $db->sql_fetchrow($result) ) 'MSN' => $msn, 'YIM_IMG' => $yim_img, 'YIM' => $yim, + 'ACTIVE' => $row['user_last_active'], 'S_ROW_COUNT' => $i, @@ -281,214 +293,42 @@ if ( $row = $db->sql_fetchrow($result) ) $i++; } - while ( $row = $db->sql_fetchrow($result) ); + while ($row = $db->sql_fetchrow($result)); } +// Generate page +$template->assign_vars(array( + 'PAGINATION' => generate_pagination($pagination_url, $total_users, $config['topics_per_page'], $start). ' ', + 'PAGE_NUMBER' => on_page($total_users, $config['topics_per_page'], $start), + + 'L_EMAIL' => $user->lang['Email'], + 'L_WEBSITE' => $user->lang['Website'], + 'L_FROM' => $user->lang['Location'], + 'L_ORDER' => $user->lang['Order'], + 'L_SORT' => $user->lang['Sort'], + 'L_SUBMIT' => $user->lang['Sort'], + 'L_AIM' => $user->lang['AIM'], + 'L_YIM' => $user->lang['YIM'], + 'L_MSNM' => $user->lang['MSNM'], + 'L_ICQ' => $user->lang['ICQ'], + 'L_JOINED' => $user->lang['Joined'], + 'L_POSTS' => $user->lang['Posts'], + 'L_GOTO_PAGE' => $user->lang['Goto_page'], + + 'S_MODE_SELECT' => $s_sort_key, + 'S_ORDER_SELECT' => $s_sort_dir, + 'S_MODE_ACTION' => "memberlist.$phpEx$SID&mode=$mode&form=$form") +); + +// Output the page $page_title = $user->lang['Memberlist']; include($phpbb_root_path . 'includes/page_header.'.$phpEx); $template->set_filenames(array( - 'body' => ( $mode == 'searchuser') ? 'search_username.html' : 'memberlist_body.html') + 'body' => 'memberlist_body.html') ); make_jumpbox('viewforum.'.$phpEx); include($phpbb_root_path . 'includes/page_tail.'.$phpEx); -// Username search -function username_search() -{ - global $SID, $phpEx, $phpbb_root_path; - global $db, $config, $template, $auth, $lang, $theme, $user; - global $starttime; - - $form = ( !empty($_GET['form']) ) ? $_GET['form'] : 0; - $field = ( isset($_GET['field']) ) ? $_GET['field'] : 'username'; - $start = ( isset($_GET['start']) ) ? intval($_GET['start']) : 0; - - $sort_by = ( !empty($_POST['sort_by']) ) ? intval($_POST['sort_by']) : ( ( !empty($_GET['sort_by']) ) ? $_GET['sort_by'] : '4' ); - $sort_order = ( !empty($_POST['sort_order']) ) ? $_POST['sort_order'] : ( ( !empty($_GET['sort_order']) ) ? $_GET['sort_order'] : 'd' ); - - $username = ( !empty($_POST['username']) ) ? $_POST['username'] : ( ( !empty($_GET['username']) ) ? $_GET['username'] : '' ); - $email = ( !empty($_POST['email']) ) ? $_POST['email'] : ( ( !empty($_GET['email']) ) ? $_GET['email'] : '' ); - $icq = ( !empty($_POST['icq']) ) ? intval($_POST['icq']) : ( ( !empty($_GET['icq']) ) ? $_GET['icq'] : '' ); - $aim = ( !empty($_POST['aim']) ) ? $_POST['aim'] : ( ( !empty($_GET['aim']) ) ? $_GET['aim'] : '' ); - $yahoo = ( !empty($_POST['yahoo']) ) ? $_POST['yahoo'] : ( ( !empty($_GET['yahoo']) ) ? $_GET['yahoo'] : '' ); - $msn = ( !empty($_POST['msn']) ) ? $_POST['msn'] : ( ( !empty($_GET['msn']) ) ? $_GET['msn'] : '' ); - - $joined_select = ( !empty($_POST['joined_select']) ) ? $_POST['joined_select'] : ( ( !empty($_GET['joined_select']) ) ? $_GET['joined_select'] : 'lt' ); - $active_select = ( !empty($_POST['active_select']) ) ? $_POST['active_select'] : ( ( !empty($_GET['active_select']) ) ? $_GET['active_select'] : 'lt' ); - $count_select = ( !empty($_POST['count_select']) ) ? $_POST['count_select'] : ( ( !empty($_GET['count_select']) ) ? $_GET['count_select'] : 'eq' ); - $joined = ( !empty($_POST['joined']) ) ? explode('-', $_POST['joined']) : ( ( !empty($_GET['joined']) ) ? explode('-', $_GET['joined']) : array() ); - $active = ( !empty($_POST['active']) ) ? explode('-', $_POST['active']) : ( ( !empty($_GET['active']) ) ? explode('-', $_GET['active']) : array() ); - $count = ( !empty($_POST['count']) ) ? intval($_POST['count']) : ( ( !empty($_GET['count']) ) ? $_GET['count'] : '' ); - - // - // - // - $sort_by_types_text = array($user->lang['Sort_Username'], $user->lang['Sort_Email'], $user->lang['Sort_Post_count'], $user->lang['Sort_Joined'], $user->lang['Sort_Last_active']); - $s_sort_by = ''; - for($i = 0; $i < count($sort_by_types_text); $i++) - { - $selected = ( $sort_by == $i ) ? ' selected="selected"' : ''; - $s_sort_by .= ''; - } - - $sort_order_text = array('a' => $user->lang['Ascending'], 'd' => $user->lang['Descending']); - $s_sort_order = ''; - foreach ( $sort_order_text as $key => $value ) - { - $selected = ( $sort_order == $key ) ? ' selected="selected"' : ''; - $s_sort_order .= ''; - } - - $find_count = array('lt' => $user->lang['Less_than'], 'eq' => $user->lang['Equal_to'], 'gt' => $user->lang['More_than']); - $s_find_count = ''; - foreach ( $find_count as $key => $value ) - { - $selected = ( $count_select == $key ) ? ' selected="selected"' : ''; - $s_find_count .= ''; - } - - $find_time = array('lt' => $user->lang['Before'], 'gt' => $user->lang['After']); - $s_find_join_time = ''; - foreach ( $find_time as $key => $value ) - { - $selected = ( $joined_select == $key ) ? ' selected="selected"' : ''; - $s_find_join_time .= ''; - } - $s_find_active_time = ''; - foreach ( $find_time as $key => $value ) - { - $selected = ( $active_select == $key ) ? ' selected="selected"' : ''; - $s_find_active_time .= ''; - } - - // - // - // - $key_match = array('lt' => '<', 'gt' => '>', 'eq' => '='); - $sort_by_types = array('username', 'user_email', 'user_posts', 'user_regdate', 'user_lastvisit'); - - $where_sql = ''; - $where_sql .= ( $username ) ? " AND username LIKE '" . str_replace('*', '%', $username) ."'" : ''; - $where_sql .= ( $email ) ? " AND user_email LIKE '" . str_replace('*', '%', $email) ."' " : ''; - $where_sql .= ( $icq ) ? " AND user_icq LIKE '" . str_replace('*', '%', $icq) ."' " : ''; - $where_sql .= ( $aim ) ? " AND user_aim LIKE '" . str_replace('*', '%', $aim) ."' " : ''; - $where_sql .= ( $yahoo ) ? " AND user_yim LIKE '" . str_replace('*', '%', $yahoo) ."' " : ''; - $where_sql .= ( $msn ) ? " AND user_msnm LIKE '" . str_replace('*', '%', $msn) ."' " : ''; - $where_sql .= ( $joined ) ? " AND user_regdate " . $key_match[$joined_select] . " " . gmmktime(0, 0, 0, intval($joined[1]), intval($joined[2]), intval($joined[0])) : ''; - $where_sql .= ( $count ) ? " AND user_posts " . $key_match[$count_select] . " $count " : ''; - $where_sql .= ( $active ) ? " AND user_lastvisit " . $key_match[$active_select] . " " . gmmktime(0, 0, 0, $active[1], intval($active[2]), intval($active[0])) : ''; - - $order_by = $sort_by_types[$sort_by] . ' ' . ( ( $sort_order == 'a' ) ? 'ASC' : 'DESC' ); - - $sql = "SELECT COUNT(user_id) AS total_users - FROM " . USERS_TABLE . " - WHERE user_id <> " . ANONYMOUS . " - $where_sql"; - $result = $db->sql_query($sql); - - $total_users = ( $row = $db->sql_fetchrow($result) ) ? $row['total_users'] : 0; - - $pagination = generate_pagination("search.$phpEx$SID&mode=searchuser&form=$form&field=$field&username=" . urlencode($username) . "&email=" . urlencode($email) . "&icq=$icq&aim=" . urlencode($aim) . "&yahoo=" . urlencode($yahoo) . "&msn=" . urlencode($msn) . "&joined=" . urlencode(implode('-', $joined)) . "&active=" . urlencode(implode('-', $active)) . "&count=$count&sort_order=$sort_order&sort_by=$sort_by&joined_select=$joined_select&active_select=$active_select&count_select=$count_select", $total_users, $config['topics_per_page'], $start); - - // - // - // - $page_title = $user->lang['Search']; - include($phpbb_root_path . 'includes/page_header.'.$phpEx); - - $template->set_filenames(array( - 'search_user_body' => 'search_username.html') - ); - - $template->assign_vars(array( - 'USERNAME' => $username, - 'EMAIL' => $email, - 'ICQ' => $icq, - 'AIM' => $aim, - 'YAHOO' => $yahoo, - 'MSNM' => $msn, - 'JOINED' => implode('-', $joined), - 'ACTIVE' => implode('-', $active), - 'COUNT' => $count, - - 'PAGINATION' => $pagination, - 'PAGE_NUMBER' => sprintf($user->lang['Page_of'], ( floor( $start / $config['topics_per_page'] ) + 1 ), ceil( $total_users / $config['topics_per_page'] )), - - 'L_SEARCH_USERNAME' => $user->lang['Find_username'], - 'L_SEARCH_EXPLAIN' => $user->lang['Find_username_explain'], - 'L_RESET' => $user->lang['Reset'], - 'L_EMAIL' => $user->lang['Email'], - 'L_ICQ_NUMBER' => $user->lang['ICQ'], - 'L_MESSENGER' => $user->lang['MSNM'], - 'L_YAHOO' => $user->lang['YIM'], - 'L_AIM' => $user->lang['AIM'], - 'L_JOINED' => $user->lang['Joined'], - 'L_ACTIVE' => $user->lang['Last_active'], - 'L_POSTS' => $user->lang['Posts'], - 'L_SORT_BY' => $user->lang['Sort_by'], - 'L_SORT_ASCENDING' => $user->lang['Sort_Ascending'], - 'L_SORT_DESCENDING' => $user->lang['Sort_Descending'], - 'L_SELECT_MARKED' => $user->lang['Select_marked'], - 'L_MARK' => $user->lang['Mark'], - 'L_MARK_ALL' => $user->lang['Mark_all'], - 'L_UNMARK_ALL' => $user->lang['Unmark_all'], - - 'S_FORM_NAME' => $form, - 'S_FIELD_NAME' => $field, - 'S_COUNT_OPTIONS' => $s_find_count, - 'S_JOINED_TIME_OPTIONS' => $s_find_join_time, - 'S_ACTIVE_TIME_OPTIONS' => $s_find_active_time, - 'S_SORT_OPTIONS' => $s_sort_by, - 'S_SORT_ORDER' => $s_sort_order, - 'S_USERNAME_OPTIONS' => $username_list, - 'S_SEARCH_ACTION' => "search.$phpEx$SID&mode=searchuser&field=$field") - ); - - $sql = "SELECT username, user_id, user_viewemail, user_posts, user_regdate, user_email, user_lastvisit - FROM " . USERS_TABLE . " - WHERE user_id <> " . ANONYMOUS . " - $where_sql - ORDER BY $order_by - LIMIT $start, " . $config['topics_per_page']; - $result = $db->sql_query($sql); - - if ( $row = $db->sql_fetchrow($result) ) - { - $i = 0; - do - { - $username = $row['username']; - $user_id = $row['user_id']; - - $joined = $user->format_date($row['user_regdate'], $user->lang['DATE_FORMAT']); - $posts = ( $row['user_posts'] ) ? $row['user_posts'] : 0; - $active = ( !$row['user_lastvisit'] ) ? $user->lang['Never'] : $user->format_date($row['user_lastvisit'], $user->lang['DATE_FORMAT']); - - $temp_url = "profile.$phpEx$SID&mode=viewprofile&u=$user_id"; - $profile_img = '' . $user->img('icon_profile', $user->lang['Read_profile']) . ''; - $profile = '' . $user->lang['Read_profile'] . ''; - - $template->assign_block_vars('memberrow', array( - 'ROW_NUMBER' => $i + ( $start + 1 ), - 'USERNAME' => $username, - 'JOINED' => $joined, - 'POSTS' => $posts, - 'ACTIVE' => $active, - 'PROFILE_IMG' => $profile_img, - 'PROFILE' => $profile) - ); - - $i++; - } - while ( $row = $db->sql_fetchrow($result) ); - } - - $template->display('search_user_body'); - - include($phpbb_root_path . 'includes/page_tail.'.$phpEx); - exit; -} - ?> \ No newline at end of file diff --git a/phpBB/templates/subSilver/memberlist_body.html b/phpBB/templates/subSilver/memberlist_body.html index 999bcf2dd2..bf467b65f9 100644 --- a/phpBB/templates/subSilver/memberlist_body.html +++ b/phpBB/templates/subSilver/memberlist_body.html @@ -1,6 +1,91 @@ -
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_SEARCH_USERNAME}
{L_SEARCH_EXPLAIN}
{L_USERNAME}:
{L_EMAIL}:
{L_ICQ_NUMBER}:
{L_AIM}:
{L_YAHOO}:
{L_MESSENGER}:
{L_JOINED}:
{L_ACTIVE}:
{L_POSTS}:
{L_SORT_BY}: {S_SORT_OPTIONS} {S_ORDER_SELECT} 
  
+ + +
@@ -8,7 +93,7 @@
{L_INDEX} {L_SELECT_SORT_METHOD}: {S_MODE_SELECT}  {L_ORDER} {S_ORDER_SELECT} 
- + @@ -17,6 +102,7 @@ + @@ -32,28 +118,23 @@ + - - + +
#   {L_USERNAME}{L_JOINED} {L_POSTS} {L_WEBSITE}{L_MARK}
{memberrow.JOINED} {memberrow.POSTS}  {memberrow.WWW_IMG} 
 
- - - - -
- - - - - +
{PAGE_NUMBER}{S_TIMEZONE}
{PAGINATION}
+ + +
{PAGE_NUMBER}{L_MARK_ALL} :: {L_UNMARK_ALL}

{S_TIMEZONE}
{PAGINATION}
- +