diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index b9e8047988..da82f03916 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -89,9 +89,9 @@ else { $order_by = "user_regdate $sort_order LIMIT $start, " . $board_config['topics_per_page']; } -$sql = "SELECT username, user_id, user_viewemail, user_posts, user_regdate, user_from, user_website, user_email +$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 FROM " . USERS_TABLE . " - WHERE user_id <> ".ANONYMOUS." + WHERE user_id <> " . ANONYMOUS . " ORDER BY $order_by"; // @@ -141,8 +141,6 @@ if(($selected_members = $db->sql_numrows($result)) > 0) $template->assign_var_from_handle("JUMPBOX", "jumpbox"); $template->assign_vars(array( - "PM_IMG" => $images['privmsg'], - "L_SELECT_SORT_METHOD" => $lang['Select_sort_method'], "L_EMAIL" => $lang['Email'], "L_WEBSITE" => $lang['Website'], @@ -150,7 +148,10 @@ if(($selected_members = $db->sql_numrows($result)) > 0) "L_ORDER" => $lang['Order'], "L_SORT" => $lang['Sort'], "L_SUBMIT" => $lang['Sort'], - "L_SEND_PRIV_MSG" => $lang['Private_messaging'], + "L_AIM" => $lang['AIM'], + "L_YIM" => $lang['YIM'], + "L_MSNM" => $lang['MSNM'], + "L_ICQ" => $lang['ICQ'], "S_MODE_SELECT" => $select_sort_mode, "S_ORDER_SELECT" => $select_sort_order, @@ -159,36 +160,76 @@ if(($selected_members = $db->sql_numrows($result)) > 0) $members = $db->sql_fetchrowset($result); - for($x = 0; $x < $selected_members; $x++) + for($i = 0; $i < $selected_members; $i++) { - unset($email); + $username = stripslashes($members[$i]['username']); + $user_id = $members[$i]['user_id']; - $username = stripslashes($members[$x]['username']); - $user_id = $members[$x]['user_id']; - $posts = $members[$x]['user_posts']; - $from = stripslashes($members[$x]['user_from']); - $joined = create_date($board_config['default_dateformat'], $members[$x]['user_regdate'], $board_config['default_timezone']); + $from = stripslashes($members[$i]['user_from']); + + $joined = create_date($board_config['default_dateformat'], $members[$i]['user_regdate'], $board_config['default_timezone']); + + $posts = ($members[$i]['user_posts']) ? $members[$i]['user_posts'] : 0; - if($members[$x]['user_viewemail']) + if($members[$i]['user_avatar'] != "" && $userdata['user_id'] != ANONYMOUS) { - $email = str_replace("@", " at ", $members[$x]['user_email']); - $email = "$email"; + $poster_avatar = (strstr("http", $members[$i]['user_avatar']) && $board_config['allow_avatar_remote']) ? "" : ""; } else { - $email = " "; + $poster_avatar = ""; } - - if($members[$x]['user_website'] != "") + + if( !empty($members[$i]['user_viewemail']) ) { - $website = ""; + $altered_email = str_replace("@", " at ", $members[$i]['user_email']); + $email_img = "\"""; } else { - $website = " "; + $email_img = " "; } + + $pm_img = "\"""; - if(!($x % 2)) + if($members[$i]['user_website'] != "") + { + if(!eregi("^http\:\/\/", $members[$i]['user_website'])) + { + $website_url = "http://" . stripslashes($members[$i]['user_website']); + } + else + { + $website_url = stripslashes($members[$i]['user_website']); + } + $www_img = ""; + } + else + { + $www_img = " "; + } + + if($members[$i]['user_icq']) + { + $icq_status_img = "\"$l_icqstatus\""; + + $icq_add_img = "\"$l_icq\""; + } + else + { + $icq_status_img = " "; + $icq_add_img = " "; + } + + $aim_img = ($members[$i]['user_aim']) ? "" : " "; + + $msn_img = ($members[$i]['user_msnm']) ? "" : " "; + + $yim_img = ($members[$i]['user_yim']) ? "" : " "; + + $search_img = ""; + + if(!($i % 2)) { $row_color = "#" . $theme['td_color1']; } @@ -196,17 +237,24 @@ if(($selected_members = $db->sql_numrows($result)) > 0) { $row_color = "#" . $theme['td_color2']; } + $template->assign_block_vars("memberrow", array( "U_VIEWPROFILE" => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $user_id), - "U_PRIVATE_MESSAGE" => append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=" . $members[$x]['user_id']), "ROW_COLOR" => $row_color, "USERNAME" => $username, "FROM" => $from, "JOINED" => $joined, "POSTS" => $posts, - "EMAIL" => $email, - "WEBSITE" => $website) + "EMAIL_IMG" => $email_img, + "PM_IMG" => $pm_img, + "WWW_IMG" => $www_img, + "ICQ_STATUS_IMG" => $icq_status_img, + "ICQ_ADD_IMG" => $icq_add_img, + "AIM_IMG" => $aim_img, + "YIM_IMG" => $yim_img, + "MSN_IMG" => $msn_img, + "SEARCH_IMG" => $search) ); } diff --git a/phpBB/templates/Default/memberlist_body.tpl b/phpBB/templates/Default/memberlist_body.tpl index 6657b7d519..a00c311bc0 100644 --- a/phpBB/templates/Default/memberlist_body.tpl +++ b/phpBB/templates/Default/memberlist_body.tpl @@ -1,28 +1,32 @@ + + + + + +
{L_SELECT_SORT_METHOD}: {S_MODE_SELECT}  {L_ORDER} {S_ORDER_SELECT}  
+
- - - - + + - - + - + + - - + diff --git a/phpBB/templates/PSO/memberlist_body.tpl b/phpBB/templates/PSO/memberlist_body.tpl index ee8d696157..edb09f8b54 100644 --- a/phpBB/templates/PSO/memberlist_body.tpl +++ b/phpBB/templates/PSO/memberlist_body.tpl @@ -11,21 +11,21 @@ - + + - - +
{L_SELECT_SORT_METHOD}: {S_MODE_SELECT}  {L_ORDER} {S_ORDER_SELECT}  
   {L_USERNAME}{L_EMAIL} {L_FROM} {L_JOINED} {L_POSTS}{L_EMAIL}{L_WEBSITE}{L_WEBSITE}
 {L_SEND_PRIV_MSG}  {memberrow.PM_IMG}  {memberrow.USERNAME} {memberrow.EMAIL_IMG}  {memberrow.FROM} {memberrow.JOINED} {memberrow.POSTS}{memberrow.EMAIL}{memberrow.WEBSITE} {memberrow.WWW_IMG} 
  {L_USERNAME} + {L_EMAIL} {L_FROM} {L_JOINED} {L_POSTS} - {L_EMAIL} {L_WEBSITE}
 {L_SEND_PRIV_MSG}  {memberrow.PM_IMG}  {memberrow.USERNAME} {memberrow.EMAIL_IMG}  {memberrow.FROM} {memberrow.JOINED} {memberrow.POSTS}{memberrow.EMAIL}{memberrow.WEBSITE} {memberrow.WWW_IMG}