Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2 memberlist.php,1.107,1.108 posting.php,1.359,1.360 style.php,1.8,1.9 ucp.php,1.46,1.47
|
From: Meik S. <acy...@us...> - 2005-08-19 10:48:56
|
Update of /cvsroot/phpbb/phpBB2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23207 Modified Files: memberlist.php posting.php style.php ucp.php Log Message: - add ability to limit search to groups Index: memberlist.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/memberlist.php,v retrieving revision 1.107 retrieving revision 1.108 diff -C2 -r1.107 -r1.108 *** memberlist.php 10 Jun 2005 19:07:15 -0000 1.107 --- memberlist.php 19 Aug 2005 10:48:39 -0000 1.108 *************** *** 68,72 **** $user->add_lang('groups'); ! $page_title = $user->lang['TEAM']; $template_html = 'memberlist_leaders.html'; --- 68,72 ---- $user->add_lang('groups'); ! $page_title = $user->lang['THE_TEAM']; $template_html = 'memberlist_leaders.html'; *************** *** 152,156 **** 'U_GROUP' => $u_group, ! 'U_PROFILE' => "{$phpbb_root_path}memberlist.$phpEx$SID&mode=viewprofile&u=$user_id", 'U_PM' => ($auth->acl_get('u_sendpm')) ? "{$phpbb_root_path}ucp.$phpEx$SID&i=pm&mode=compose&u=$user_id" : '') ); --- 152,156 ---- 'U_GROUP' => $u_group, ! 'U_VIEWPROFILE' => "{$phpbb_root_path}memberlist.$phpEx$SID&mode=viewprofile&u={$row['user_id']}", 'U_PM' => ($auth->acl_get('u_sendpm')) ? "{$phpbb_root_path}ucp.$phpEx$SID&i=pm&mode=compose&u=$user_id" : '') ); *************** *** 195,199 **** $sql_field = 'user_jabber'; $s_select = (@extension_loaded('xml')) ? 'S_SEND_JABBER' : 'S_NO_SEND_JABBER'; ! $s_action = "memberlist.$phpEx$SID&mode=contact&action=$action&u=$user_id"; break; --- 195,199 ---- $sql_field = 'user_jabber'; $s_select = (@extension_loaded('xml')) ? 'S_SEND_JABBER' : 'S_NO_SEND_JABBER'; ! $s_action = "{$phpbb_root_path}memberlist.$phpEx$SID&mode=contact&action=$action&u=$user_id"; break; *************** *** 220,224 **** { case 'icq': ! $presence_img = '<img src="http://web.icq.com/whitepages/online?icq=' . $row[$sql_field] . '&img=5" width="18" height="18" border="0" alt="" />'; break; --- 220,224 ---- { case 'icq': ! $presence_img = '<img src="http://web.icq.com/whitepages/online?icq=' . $row[$sql_field] . '&img=5" width="18" height="18" alt="" />'; break; *************** *** 743,746 **** --- 743,747 ---- $msn = request_var('msn', ''); $jabber = request_var('jabber', ''); + $search_group_id = request_var('search_group_id', 0); $joined_select = request_var('joined_select', 'lt'); *************** *** 787,790 **** --- 788,797 ---- $sql_where .= (sizeof($joined) > 1) ? " AND u.user_regdate " . $find_key_match[$joined_select] . ' ' . gmmktime(0, 0, 0, intval($joined[1]), intval($joined[2]), intval($joined[0])) : ''; $sql_where .= (sizeof($active) > 1) ? " AND u.user_lastvisit " . $find_key_match[$active_select] . ' ' . gmmktime(0, 0, 0, $active[1], intval($active[2]), intval($active[0])) : ''; + $sql_where .= ($search_group_id) ? " AND u.user_id = ug.user_id AND ug.group_id = $search_group_id " : ''; + + if ($search_group_id) + { + $sql_from = ', ' . USER_GROUP_TABLE . ' ug '; + } if ($ipdomain && $auth->acl_get('m_ip')) *************** *** 830,834 **** $sql_where = " AND u.username LIKE '" . $db->sql_escape(substr($first_char, 0, 1)) . "%'"; } ! // Are we looking at a usergroup? If so, fetch additional info // and further restrict the user info query --- 837,841 ---- $sql_where = " AND u.username LIKE '" . $db->sql_escape(substr($first_char, 0, 1)) . "%'"; } ! // Are we looking at a usergroup? If so, fetch additional info // and further restrict the user info query *************** *** 851,861 **** { case GROUP_OPEN: ! $group_row['group_type'] = 'OPEN'; break; case GROUP_CLOSED: ! $group_row['group_type'] = 'CLOSED'; break; case GROUP_HIDDEN: ! $group_row['group_type'] = 'HIDDEN'; // Check for membership or special permissions --- 858,868 ---- { case GROUP_OPEN: ! $group_row['l_group_type'] = 'OPEN'; break; case GROUP_CLOSED: ! $group_row['l_group_type'] = 'CLOSED'; break; case GROUP_HIDDEN: ! $group_row['l_group_type'] = 'HIDDEN'; // Check for membership or special permissions *************** *** 866,873 **** break; case GROUP_SPECIAL: ! $group_row['group_type'] = 'SPECIAL'; break; case GROUP_FREE: ! $group_row['group_type'] = 'FREE'; break; } --- 873,880 ---- break; case GROUP_SPECIAL: ! $group_row['l_group_type'] = 'SPECIAL'; break; case GROUP_FREE: ! $group_row['l_group_type'] = 'FREE'; break; } *************** *** 904,910 **** $template->assign_vars(array( 'GROUP_DESC' => $group_row['group_description'], ! 'GROUP_NAME' => $group_row['group_name'], 'GROUP_COLOR' => $group_row['group_colour'], ! 'GROUP_TYPE' => $user->lang['GROUP_IS_' . $group_row['group_type']], 'GROUP_RANK' => $rank_title, --- 911,917 ---- $template->assign_vars(array( 'GROUP_DESC' => $group_row['group_description'], ! 'GROUP_NAME' => ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'], 'GROUP_COLOR' => $group_row['group_colour'], ! 'GROUP_TYPE' => $user->lang['GROUP_IS_' . $group_row['l_group_type']], 'GROUP_RANK' => $rank_title, *************** *** 969,972 **** --- 976,994 ---- if ($mode == 'searchuser' && ($config['load_search'] || $auth->acl_get('a_'))) { + $group_selected = request_var('search_group_id', 0); + $s_group_select = '<option value="0"' . ((!$group_selected) ? ' selected="selected"' : '') . '> </option>'; + + $sql = 'SELECT group_id, group_name, group_type + FROM ' . GROUPS_TABLE . ' + WHERE group_type <> ' . GROUP_HIDDEN . ' + ORDER BY group_name ASC'; + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + $s_group_select .= '<option value="' . $row['group_id'] . '"' . (($group_selected == $row['group_id']) ? ' selected="selected"' : '') . '>' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>'; + } + $db->sql_freeresult($result); + $template->assign_vars(array( 'USERNAME' => $username, *************** *** 989,992 **** --- 1011,1015 ---- 'S_JOINED_TIME_OPTIONS' => $s_find_join_time, 'S_ACTIVE_TIME_OPTIONS' => $s_find_active_time, + 'S_GROUP_SELECT' => $s_group_select, 'S_SEARCH_ACTION' => "{$phpbb_root_path}memberlist.$phpEx$SID&mode=searchuser&form=$form&field=$field") ); *************** *** 1194,1208 **** 'U_PROFILE' => "{$phpbb_root_path}memberlist.$phpEx$SID&mode=viewprofile&u=$user_id", ! 'U_SEARCH_USER' => ($auth->acl_get('u_search')) ? "search.$phpEx$SID&search_author=" . urlencode($username) . "&show_results=posts" : '', ! 'U_PM' => ($auth->acl_get('u_sendpm')) ? "ucp.$phpEx$SID&i=pm&mode=compose&u=$user_id" : '', 'U_EMAIL' => $email, 'U_WWW' => (!empty($data['user_website'])) ? $data['user_website'] : '', ! 'U_ICQ' => ($data['user_icq']) ? "memberlist.$phpEx$SID&mode=contact&action=icq&u=$user_id" : '', ! 'U_AIM' => ($data['user_aim']) ? "memberlist.$phpEx$SID&mode=contact&action=aim&u=$user_id" : '', 'U_YIM' => ($data['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . $data['user_yim'] . '&.src=pg' : '', ! 'U_MSN' => ($data['user_msnm']) ? "memberlist.$phpEx$SID&mode=contact&action=msnm&u=$user_id" : '', ! 'U_JABBER' => ($data['user_jabber']) ? "memberlist.$phpEx$SID&mode=contact&action=jabber&u=$user_id" : '', ! 'S_ONLINE' => (intval($data['session_time']) >= time() - 300) ? true : false ); } --- 1217,1231 ---- 'U_PROFILE' => "{$phpbb_root_path}memberlist.$phpEx$SID&mode=viewprofile&u=$user_id", ! 'U_SEARCH_USER' => ($auth->acl_get('u_search')) ? "{$phpbb_root_path}search.$phpEx$SID&search_author=" . urlencode($username) . "&show_results=posts" : '', ! 'U_PM' => ($auth->acl_get('u_sendpm')) ? "{$phpbb_root_path}ucp.$phpEx$SID&i=pm&mode=compose&u=$user_id" : '', 'U_EMAIL' => $email, 'U_WWW' => (!empty($data['user_website'])) ? $data['user_website'] : '', ! 'U_ICQ' => ($data['user_icq']) ? "{$phpbb_root_path}memberlist.$phpEx$SID&mode=contact&action=icq&u=$user_id" : '', ! 'U_AIM' => ($data['user_aim']) ? "{$phpbb_root_path}memberlist.$phpEx$SID&mode=contact&action=aim&u=$user_id" : '', 'U_YIM' => ($data['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . $data['user_yim'] . '&.src=pg' : '', ! 'U_MSN' => ($data['user_msnm']) ? "{$phpbb_root_path}memberlist.$phpEx$SID&mode=contact&action=msnm&u=$user_id" : '', ! 'U_JABBER' => ($data['user_jabber']) ? "{$phpbb_root_path}memberlist.$phpEx$SID&mode=contact&action=jabber&u=$user_id" : '', ! 'S_ONLINE' => (intval($data['session_time']) >= time() - ($config['load_online_time'] * 60)) ? true : false ); } Index: posting.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/posting.php,v retrieving revision 1.359 retrieving revision 1.360 diff -C2 -r1.359 -r1.360 *** posting.php 10 Jun 2005 18:57:21 -0000 1.359 --- posting.php 19 Aug 2005 10:48:39 -0000 1.360 *************** *** 331,335 **** if ($mode == 'delete' && (($poster_id == $user->data['user_id'] && $user->data['is_registered'] && $auth->acl_get('f_delete', $forum_id) && $post_id == $topic_last_post_id) || $auth->acl_get('m_delete', $forum_id))) { ! $s_hidden_fields = '<input type="hidden" name="p" value="' . $post_id . '" /><input type="hidden" name="f" value="' . $forum_id . '" /><input type="hidden" name="mode" value="delete" />'; if (confirm_box(true)) --- 331,339 ---- if ($mode == 'delete' && (($poster_id == $user->data['user_id'] && $user->data['is_registered'] && $auth->acl_get('f_delete', $forum_id) && $post_id == $topic_last_post_id) || $auth->acl_get('m_delete', $forum_id))) { ! $s_hidden_fields = build_hidden_fields(array( ! 'p' => $post_id, ! 'f' => $forum_id, ! 'mode' => 'delete') ! ); if (confirm_box(true)) Index: style.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/style.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** style.php 9 Apr 2005 12:26:36 -0000 1.8 --- style.php 19 Aug 2005 10:48:39 -0000 1.9 *************** *** 40,44 **** require($phpbb_root_path . 'includes/db/' . $dbms . '.'.$phpEx); ! $db = new sql_db(); $cache = new acm(); --- 40,44 ---- require($phpbb_root_path . 'includes/db/' . $dbms . '.'.$phpEx); ! $db = new $sql_db(); $cache = new acm(); Index: ucp.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/ucp.php,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -r1.46 -r1.47 *** ucp.php 8 Jul 2005 12:29:45 -0000 1.46 --- ucp.php 19 Aug 2005 10:48:39 -0000 1.47 *************** *** 307,311 **** // We destroy the session here, the user will be logged out nevertheless ! $user->destroy(); meta_refresh(3, "{$phpbb_root_path}index.$phpEx$SID"); --- 307,311 ---- // We destroy the session here, the user will be logged out nevertheless ! $user->session_kill(); meta_refresh(3, "{$phpbb_root_path}index.$phpEx$SID"); |
