From 5a1e2e5deba82602773424363f7047b942ef0d91 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Tue, 31 Jul 2001 21:56:31 +0000 Subject: [PATCH] More compliance ... it never ends git-svn-id: file:///svn/phpbb/trunk@774 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/memberlist.php | 56 ++++++++++--------------- phpBB/templates/PSO/memberlist_body.tpl | 39 ++++++++--------- 2 files changed, 43 insertions(+), 52 deletions(-) diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 4237f0a195..dbffab15ff 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -105,7 +105,7 @@ $mode_types = array("joindate", "username", "location", "posts", "email", "websi $select_sort_mode = ""; @@ -113,11 +113,11 @@ $select_sort_mode .= ""; $select_sort_order = ""; @@ -137,6 +137,9 @@ if(($selected_members = $db->sql_numrows($result)) > 0) $jumpbox = make_jumpbox(); $template->assign_vars(array( + "L_GO" => $lang['Go'], + "L_JUMP_TO" => $lang['Jump_to'], + "L_SELECT_FORUM" => $lang['Select_forum'], "JUMPBOX_LIST" => $jumpbox, "SELECT_NAME" => POST_FORUM_URL) ); @@ -167,7 +170,7 @@ if(($selected_members = $db->sql_numrows($result)) > 0) $username = stripslashes($members[$i]['username']); $user_id = $members[$i]['user_id']; - $from = stripslashes($members[$i]['user_from']); + $from = (!empty($members[$i]['user_from'])) ? stripslashes($members[$i]['user_from']) : " "; $joined = create_date($board_config['default_dateformat'], $members[$i]['user_regdate'], $board_config['default_timezone']); @@ -175,7 +178,7 @@ if(($selected_members = $db->sql_numrows($result)) > 0) if($members[$i]['user_avatar'] != "" && $user_id != ANONYMOUS) { - $poster_avatar = (strstr("http", $members[$i]['user_avatar']) && $board_config['allow_avatar_remote']) ? "" : ""; + $poster_avatar = (strstr("http", $members[$i]['user_avatar']) && $board_config['allow_avatar_remote']) ? "\"\"" : "\"\""; } else { @@ -185,26 +188,18 @@ if(($selected_members = $db->sql_numrows($result)) > 0) if( !empty($members[$i]['user_viewemail']) ) { $altered_email = str_replace("@", " at ", $members[$i]['user_email']); - $email_img = "\"""; + $email_img = "\"""; } else { $email_img = " "; } - $pm_img = "\"""; + $pm_img = "\"""; 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 = ""; + $www_img = "\"""; } else { @@ -213,9 +208,9 @@ if(($selected_members = $db->sql_numrows($result)) > 0) if($members[$i]['user_icq']) { - $icq_status_img = ""; + $icq_status_img = "\"\""; - $icq_add_img = "\"""; + $icq_add_img = "\"""; } else { @@ -223,27 +218,22 @@ if(($selected_members = $db->sql_numrows($result)) > 0) $icq_add_img = " "; } - $aim_img = ($members[$i]['user_aim']) ? "" : " "; + $aim_img = ($members[$i]['user_aim']) ? "\""" : " "; - $msn_img = ($members[$i]['user_msnm']) ? "" : " "; + $msn_img = ($members[$i]['user_msnm']) ? "\""" : " "; - $yim_img = ($members[$i]['user_yim']) ? "" : " "; + $yim_img = ($members[$i]['user_yim']) ? "\""" : " "; - $search_img = ""; + $search_img = "\"""; - if(!($i % 2)) - { - $row_color = "#" . $theme['td_color1']; - } - else - { - $row_color = "#" . $theme['td_color2']; - } + $row_color = "#" . ( (!($i % 2)) ? $theme['td_color1'] : $theme['td_color2']); + $row_class = (!($i % 2)) ? $theme['td_class1'] : $theme['td_class2']; $template->assign_block_vars("memberrow", array( - "U_VIEWPROFILE" => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $user_id), + "U_VIEWPROFILE" => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $user_id), - "ROW_COLOR" => $row_color, + "ROW_COLOR" => $row_color, + "ROW_CLASS" => $row_class, "USERNAME" => $username, "FROM" => $from, "JOINED" => $joined, @@ -277,7 +267,7 @@ if(($selected_members = $db->sql_numrows($result)) > 0) $total = $db->sql_fetchrow($count_result); $total_members = $total['total']; - $pagination = generate_pagination("memberlist.$phpEx?mode=$mode&order=$sort_order", $total_members, $board_config['topics_per_page'], $start)." "; + $pagination = generate_pagination("memberlist.$phpEx?mode=$mode&order=$sort_order", $total_members, $board_config['topics_per_page'], $start)." "; } } else diff --git a/phpBB/templates/PSO/memberlist_body.tpl b/phpBB/templates/PSO/memberlist_body.tpl index 6c8b568a8c..4f2792f43d 100644 --- a/phpBB/templates/PSO/memberlist_body.tpl +++ b/phpBB/templates/PSO/memberlist_body.tpl @@ -1,8 +1,9 @@ - - + +
+ - - + +
{SITENAME} {L_INDEX}{L_SELECT_SORT_METHOD}: {S_MODE_SELECT}  {L_ORDER} {S_ORDER_SELECT}  
{L_SELECT_SORT_METHOD}: {S_MODE_SELECT}  {L_ORDER} {S_ORDER_SELECT}  
@@ -10,22 +11,22 @@ -
- + + + + + - - - - - - - + + + + + + + @@ -38,11 +39,11 @@
 {L_USERNAME} - {L_EMAIL} - {L_FROM} - {L_JOINED} - {L_POSTS} - {L_WEBSITE} + {L_USERNAME}{L_EMAIL}{L_FROM}{L_JOINED}{L_POSTS}{L_WEBSITE}
 {memberrow.PM_IMG} {memberrow.USERNAME} {memberrow.EMAIL_IMG} {memberrow.FROM}{memberrow.JOINED}{memberrow.POSTS} {memberrow.WWW_IMG}  {memberrow.PM_IMG} {memberrow.USERNAME} {memberrow.EMAIL_IMG} {memberrow.FROM}{memberrow.JOINED}{memberrow.POSTS} {memberrow.WWW_IMG} 
+ - +
{S_TIMEZONE}{JUMPBOX}{JUMPBOX}