From 9be9a6602b6c066e84bbe34598765defef353828 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Mon, 24 Dec 2001 18:11:20 +0000 Subject: Altered way ICQ overlay is done, uses JavaScript ... don't want this generated within the source code, fixed website issue in profile git-svn-id: file:///svn/phpbb/trunk@1708 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/privmsg.php | 18 +++------------ phpBB/profile.php | 66 ++++++++++++++++++++++------------------------------- phpBB/viewtopic.php | 18 +++------------ 3 files changed, 33 insertions(+), 69 deletions(-) diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php index e9db673a7c..e816b33796 100644 --- a/phpBB/privmsg.php +++ b/phpBB/privmsg.php @@ -468,21 +468,7 @@ else if( $mode == "read" ) if( $privmsg['user_icq'] ) { $icq_status_img = ""; - - // - // This cannot stay like this, it needs a 'proper' solution, eg a separate - // template for overlaying the ICQ icon, or we just do away with the icq status - // display (which is after all somewhat a pain in the rear :D - // - if( $theme['template_name'] == "subSilver" ) - { - $icq_add_img = '
' . $icq_status_img . '' . $lang['ICQ'] . '
'; - $icq_status_img = ""; - } - else - { - $icq_add_img = "\"""; - } + $icq_add_img = "\"""; } else { @@ -571,6 +557,8 @@ else if( $mode == "read" ) "SEARCH_IMG" => $search_img, "EMAIL_IMG" => $email_img, "WWW_IMG" => $www_img, + "ICQ" => ( $privmsg['user_icq'] ) ? $privmsg['user_icq'] : " ", + "ICQ_IMG" => ( $privmsg['user_icq'] ) ? $images['icon_icq'] : " ", "ICQ_STATUS_IMG" => $icq_status_img, "ICQ_ADD_IMG" => $icq_add_img, "AIM_IMG" => $aim_img, diff --git a/phpBB/profile.php b/phpBB/profile.php index b228040397..60867ea298 100644 --- a/phpBB/profile.php +++ b/phpBB/profile.php @@ -216,9 +216,6 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) // Output page header and // profile_view template // - $page_title = $lang['Viewing_profile']; - include($phpbb_root_path . 'includes/page_header.'.$phpEx); - $template->set_filenames(array( "body" => "profile_view_body.tpl", "jumpbox" => "jumpbox.tpl") @@ -262,8 +259,8 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) { $email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&" . POST_USERS_URL ."=" . $profiledata['user_id']) : "mailto:" . $profiledata['user_email']; - $email = "" . $lang['Send_email'] . ""; - $email_img = "\"""; + $email = '' . $lang['Send_email'] . ''; + $email_img = '' . $lang['Send_email'] . ''; } else { @@ -276,13 +273,13 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) switch( $profiledata['user_avatar_type'] ) { case USER_AVATAR_UPLOAD: - $avatar_img = "\"\""; + $avatar_img = ''; break; case USER_AVATAR_REMOTE: - $avatar_img = "\"\""; + $avatar_img = ''; break; case USER_AVATAR_GALLERY: - $avatar_img = "\"\""; + $avatar_img = ''; break; } } @@ -312,7 +309,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) if( $profiledata['user_posts'] > $ranksrow[$j]['rank_min'] && !$ranksrow[$j]['rank_special'] ) { $poster_rank = $ranksrow[$j]['rank_title']; - $rank_image = ($ranksrow[$j]['rank_image']) ? "
" : ""; + $rank_image = ( $ranksrow[$j]['rank_image'] ) ? "
" : ""; } } } @@ -320,22 +317,8 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) if( !empty($profiledata['user_icq']) ) { - $icq_status_img = ""; - - // - // This cannot stay like this, it needs a 'proper' solution, eg a separate - // template for overlaying the ICQ icon, or we just do away with the icq status - // display (which is after all somewhat a pain in the rear :D - // - if( $theme['template_name'] == "subSilver" ) - { - $icq_add_img = '
' . $icq_status_img . '' . $lang['ICQ'] . '
'; - $icq_status_img = ""; - } - else - { - $icq_add_img = "\"""; - } + $icq_status_img = ''; + $icq_add_img = '' . $lang['ICQ'] . ''; } else { @@ -343,16 +326,16 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) $icq_add_img = " "; } - $aim_img = ($profiledata['user_aim']) ? "\""" : " "; + $aim_img = ( $profiledata['user_aim'] ) ? '' . $lang['AIM'] . '' : " "; - $msnm_img = ($profiledata['user_msnm']) ? "\"" " . $profiledata['user_msnm'] : " "; + $msnm_img = ( $profiledata['user_msnm'] ) ? '' . $lang['MSNM'] . ' ' . $profiledata['user_msnm'] : " "; - $yim_img = ( $profiledata['user_yim'] ) ? "\""" : " "; + $yim_img = ( $profiledata['user_yim'] ) ? '' . $lang['YIM'] . '' : " "; - $search_img = "\"""; - $search = "" . $lang['Search_user_posts'] . ""; + $search_img = '' . $lang['Search_user_posts'] . ''; + $search = "" . $lang['Search_user_posts'] . ""; - $www_img = ($profiledata['user_website']) ? "\""" : " "; + $www_img = ( $profiledata['user_website'] ) ? '' . $lang['Visit_website'] . '' : " "; $pm_img = "\"""; @@ -371,19 +354,21 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) "PM_IMG" => $pm_img, "UL_SEARCH" => $search, "SEARCH_IMG" => $search_img, + "ICQ" => ( $profiledata['user_icq'] ) ? $profiledata['user_icq'] : " ", + "ICQ_IMG" => ( $profiledata['user_icq'] ) ? $images['icon_icq'] : " ", "ICQ_ADD_IMG" => $icq_add_img, "ICQ_STATUS_IMG" => $icq_status_img, - "AIM" => ( ($profiledata['user_aim']) ? $profiledata['user_aim'] : " " ), + "AIM" => ( $profiledata['user_aim'] ) ? '' . $profiledata['user_aim'] . '' : " ", "AIM_IMG" => $aim_img, - "MSN" => ( ($profiledata['user_msnm']) ? $profiledata['user_msnm'] : " " ), + "MSN" => ( $profiledata['user_msnm'] ) ? $profiledata['user_msnm'] : " ", "MSN_IMG" => $msnm_img, - "YIM" => ( ($profiledata['user_yim']) ? $profiledata['user_yim'] : " " ), + "YIM" => ( $profiledata['user_yim'] ) ? '' . $profiledata['user_yim'] . '' : " ", "YIM_IMG" => $yim_img, - "WEBSITE" => ( ($profiledata['user_website']) ? $profiledata['user_website'] : " " ), + "WEBSITE" => ( $profiledata['user_website'] ) ? '' . $profiledata['user_website'] . '' : " ", "WEBSITE_IMG" => $www_img, - "LOCATION" => ( ($profiledata['user_from']) ? $profiledata['user_from'] : " " ), - "OCCUPATION" => ( ($profiledata['user_occ']) ? $profiledata['user_occ'] : " " ), - "INTERESTS" => ( ($profiledata['user_interests']) ? $profiledata['user_interests'] : " " ), + "LOCATION" => ( $profiledata['user_from'] ) ? $profiledata['user_from'] : " ", + "OCCUPATION" => ( $profiledata['user_occ'] ) ? $profiledata['user_occ'] : " ", + "INTERESTS" => ( $profiledata['user_interests'] ) ? $profiledata['user_interests'] : " ", "AVATAR_IMG" => $avatar_img, "L_VIEWING_PROFILE" => sprintf($lang['Viewing_user_profile'], $profiledata['username']), @@ -405,11 +390,14 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) ) "L_OCCUPATION" => $lang['Occupation'], "L_INTERESTS" => $lang['Interests'], - "U_SEARCH_USER" => append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&showresults=topics"), + "U_SEARCH_USER" => append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&showresults=posts"), "S_PROFILE_ACTION" => append_sid("profile.$phpEx")) ); + $page_title = $lang['Viewing_profile']; + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + $template->pparse("body"); include($phpbb_root_path . 'includes/page_tail.'.$phpEx); diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 84d3cc94c9..91e8cdf692 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -855,21 +855,7 @@ for($i = 0; $i < $total_posts; $i++) if( !empty($postrow[$i]['user_icq']) ) { $icq_status_img = ""; - - // - // This cannot stay like this, it needs a 'proper' solution, eg a separate - // template for overlaying the ICQ icon, or we just do away with the icq status - // display (which is after all somewhat a pain in the rear :D - // - if( $theme['template_name'] == "subSilver" ) - { - $icq_add_img = '
' . $icq_status_img . '' . $lang['ICQ'] . '
'; - $icq_status_img = ""; - } - else - { - $icq_add_img = "\"""; - } + $icq_add_img = "\"""; } else { @@ -1076,6 +1062,8 @@ for($i = 0; $i < $total_posts; $i++) "PM_IMG" => $pm_img, "EMAIL_IMG" => $email_img, "WWW_IMG" => $www_img, + "ICQ" => ( !empty($postrow[$i]['user_icq']) ) ? $postrow[$i]['user_icq'] : " ", + "ICQ_IMG" => ( !empty($postrow[$i]['user_icq']) ) ? $images['icon_icq'] : " ", "ICQ_STATUS_IMG" => $icq_status_img, "ICQ_ADD_IMG" => $icq_add_img, "AIM_IMG" => $aim_img, -- cgit v1.2.1