[Phpbb-checkins] CVS: phpBB2 privmsg.php,1.68,1.69 profile.php,1.160,1.161 viewtopic.php,1.158,1.159

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv777

Modified Files:
	privmsg.php profile.php viewtopic.php 
Log Message:
Altered way ICQ overlay is done, uses JavaScript ... don't want this generated within the source code, fixed website issue in profile

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -r1.68 -r1.69
*** privmsg.php	2001/12/24 16:01:49	1.68
--- privmsg.php	2001/12/24 18:11:19	1.69
***************
*** 469,487 ****
  	{
  		$icq_status_img = "<a href=\"http://wwp.icq.com/" . $privmsg['user_icq'] . "#pager\"><img src=\"http://web.icq.com/whitepages/online?icq=" . $privmsg['user_icq'] . "&amp;img=5\" width=\"18\" height=\"18\" border=\"0\" /></a>";
! 
! 		//
! 		// 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 = '<table width="59" border="0" cellspacing="0" cellpadding="0"><tr><td nowrap="nowrap" class="icqback"><img src="images/spacer.gif" width="3" height="18" alt = "">' . $icq_status_img . '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $privmsg['user_icq'] . '"><img src="images/spacer.gif" width="35" height="18" border="0" alt="' . $lang['ICQ'] . '" /></a></td></tr></table>'; 
! 			$icq_status_img = "";
! 		}
! 		else
! 		{
! 			$icq_add_img = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $privmsg['user_icq'] . "\"><img src=\"" . $images['icon_icq'] . "\" alt=\"" . $lang['ICQ'] . "\" border=\"0\" /></a>";
! 		}
  	}
  	else
--- 469,473 ----
  	{
  		$icq_status_img = "<a href=\"http://wwp.icq.com/" . $privmsg['user_icq'] . "#pager\"><img src=\"http://web.icq.com/whitepages/online?icq=" . $privmsg['user_icq'] . "&amp;img=5\" width=\"18\" height=\"18\" border=\"0\" /></a>";
! 		$icq_add_img = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $privmsg['user_icq'] . "\"><img src=\"" . $images['icon_icq'] . "\" alt=\"" . $lang['ICQ'] . "\" border=\"0\" /></a>";
  	}
  	else
***************
*** 572,575 ****
--- 558,563 ----
  		"EMAIL_IMG" => $email_img,
  		"WWW_IMG" => $www_img,
+ 		"ICQ" => ( $privmsg['user_icq'] ) ? $privmsg['user_icq'] : "&nbsp;", 
+ 		"ICQ_IMG" => ( $privmsg['user_icq'] ) ? $images['icon_icq'] : "&nbsp;",
  		"ICQ_STATUS_IMG" => $icq_status_img,
  		"ICQ_ADD_IMG" => $icq_add_img,

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.160
retrieving revision 1.161
diff -C2 -r1.160 -r1.161
*** profile.php	2001/12/24 14:46:35	1.160
--- profile.php	2001/12/24 18:11:20	1.161
***************
*** 217,223 ****
  		// 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",
--- 217,220 ----
***************
*** 263,268 ****
  			$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL ."=" . $profiledata['user_id']) : "mailto:" . $profiledata['user_email'];
  
! 			$email = "<a href=\"$email_uri\">" . $lang['Send_email'] . "</a>";
! 			$email_img = "<a href=\"$email_uri\"><img src=\"" . $images['icon_email'] . "\" alt=\"" . $lang['Send_email'] . "\" border=\"0\" /></a>";
  		}
  		else
--- 260,265 ----
  			$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL ."=" . $profiledata['user_id']) : "mailto:" . $profiledata['user_email'];
  
! 			$email = '<a href="$email_uri">' . $lang['Send_email'] . '</a>';
! 			$email_img = '<a href="$email_uri"><img src="' . $images['icon_email'] . '" alt="' . $lang['Send_email'] . '" border="0" /></a>';
  		}
  		else
***************
*** 277,287 ****
  			{
  				case USER_AVATAR_UPLOAD:
! 					$avatar_img = "<img src=\"" . $board_config['avatar_path'] . "/" . $profiledata['user_avatar'] . "\" alt=\"\" />";
  					break;
  				case USER_AVATAR_REMOTE:
! 					$avatar_img = "<img src=\"" . $profiledata['user_avatar'] . "\" alt=\"\" />";
  					break;
  				case USER_AVATAR_GALLERY:
! 					$avatar_img = "<img src=\"" . $board_config['avatar_gallery_path'] . "/" . $profiledata['user_avatar'] . "\" alt=\"\" />";
  					break;
  			}
--- 274,284 ----
  			{
  				case USER_AVATAR_UPLOAD:
! 					$avatar_img = '<img src="' . $board_config['avatar_path'] . '/' . $profiledata['user_avatar'] . '" alt="" />';
  					break;
  				case USER_AVATAR_REMOTE:
! 					$avatar_img = '<img src="' . $profiledata['user_avatar'] . '" alt="" />';
  					break;
  				case USER_AVATAR_GALLERY:
! 					$avatar_img = '<img src="' . $board_config['avatar_gallery_path'] . '/' . $profiledata['user_avatar'] . '" alt="" />';
  					break;
  			}
***************
*** 313,317 ****
  				{
  					$poster_rank = $ranksrow[$j]['rank_title'];
! 					$rank_image = ($ranksrow[$j]['rank_image']) ? "<img src=\"" . $ranksrow[$j]['rank_image'] . "\"><br />" : "";
  				}
  			}
--- 310,314 ----
  				{
  					$poster_rank = $ranksrow[$j]['rank_title'];
! 					$rank_image = ( $ranksrow[$j]['rank_image'] ) ? "<img src=\"" . $ranksrow[$j]['rank_image'] . "\"><br />" : "";
  				}
  			}
***************
*** 321,340 ****
  		if( !empty($profiledata['user_icq']) )
  		{
! 			$icq_status_img = "<a href=\"http://wwp.icq.com/" . $profiledata['user_icq'] . "#pager\"><img src=\"http://web.icq.com/whitepages/online?icq=" . $profiledata['user_icq'] . "&amp;img=5\" width=\"18\" height=\"18\" border=\"0\" /></a>";
! 
! 			//
! 			// 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 = '<table width="59" border="0" cellspacing="0" cellpadding="0"><tr><td nowrap="nowrap" class="icqback"><img src="images/spacer.gif" width="3" height="18" alt = "">' . $icq_status_img . '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $profiledata['user_icq'] . '"><img src="images/spacer.gif" width="35" height="18" border="0" alt="' . $lang['ICQ'] . '" /></a></td></tr></table>'; 
! 				$icq_status_img = "";
! 			}
! 			else
! 			{
! 				$icq_add_img = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $profiledata['user_icq'] . "\"><img src=\"" . $images['icon_icq'] . "\" alt=\"" . $lang['ICQ'] . "\" border=\"0\" /></a>";
! 			}
  		}
  		else
--- 318,323 ----
  		if( !empty($profiledata['user_icq']) )
  		{
! 			$icq_status_img = '<a href="http://wwp.icq.com/' . $profiledata['user_icq'] . '#pager"><img src="http://web.icq.com/whitepages/online?icq=' . $profiledata['user_icq'] . '&amp;img=5" width="18" height="18" border="0" /></a>';
! 			$icq_add_img = '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $profiledata['user_icq'] . '"><img src="' . $images['icon_icq'] . '" alt="' . $lang['ICQ'] . '" border="0" /></a>';
  		}
  		else
***************
*** 344,357 ****
  		}
  
! 		$aim_img = ($profiledata['user_aim']) ? "<a href=\"aim:goim?screenname=" . $profiledata['user_aim'] . "&amp;message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" border=\"0\" alt=\"" . $lang['AIM'] . "\" /></a>" : "&nbsp;";
  
! 		$msnm_img = ($profiledata['user_msnm']) ? "<img src=\"" . $images['icon_msnm'] . "\" border=\"0\" alt=\"" . $lang['MSNM'] . "\" /> " . $profiledata['user_msnm'] : "&nbsp;";
  
! 		$yim_img = ( $profiledata['user_yim'] ) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $members[$i]['user_yim'] . "&amp;.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\" alt=\"" . $lang['YIM'] . "\" /></a>" : "&nbsp;";
  
! 		$search_img = "<a href=\"" . append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&amp;showresults=topics") . "\"><img src=\"" . $images['icon_search'] . "\" border=\"0\" alt=\"" . $lang['Search_user_posts'] . "\" /></a>";
! 		$search = "<a href=\"" . append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&amp;showresults=topics") . "\">" . $lang['Search_user_posts'] . "</a>";
  
! 		$www_img = ($profiledata['user_website']) ? "<a href=\"" . $profiledata['user_website'] . "\"><img src=\"" . $images['icon_www'] . "\" alt=\"" . $lang['Visit_website'] . "\" border=\"0\" /></a>" : "&nbsp;";
  
  		$pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&amp;" . POST_USERS_URL . "=" . $profiledata['user_id']) . "\"><img src=\"". $images['icon_pm'] . "\" alt=\"" . $lang['Send_private_message'] . "\" border=\"0\" /></a>";
--- 327,340 ----
  		}
  
! 		$aim_img = ( $profiledata['user_aim'] ) ? '<a href="aim:goim?screenname=' . $profiledata['user_aim'] . '&amp;message=Hello+Are+you+there?"><img src="' . $images['icon_aim'] . '" border="0" alt="' . $lang['AIM'] . '" /></a>' : "&nbsp;";
  
! 		$msnm_img = ( $profiledata['user_msnm'] ) ? '<img src="' . $images['icon_msnm'] . '" border="0" alt="' . $lang['MSNM'] . '" /> ' . $profiledata['user_msnm'] : "&nbsp;";
  
! 		$yim_img = ( $profiledata['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $profiledata['user_yim'] . '&amp;.src=pg"><img src="' . $images['icon_yim'] . '" border="0" alt="' . $lang['YIM'] . '" /></a>' : "&nbsp;";
  
! 		$search_img = '<a href="' . append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&amp;showresults=posts") . '"><img src="' . $images['icon_search'] . '" border="0" alt="' . $lang['Search_user_posts'] . '" /></a>';
! 		$search = "<a href=\"" . append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&amp;showresults=posts") . "\">" . $lang['Search_user_posts'] . "</a>";
  
! 		$www_img = ( $profiledata['user_website'] ) ? '<a href="' . $profiledata['user_website'] . '"><img src="' . $images['icon_www'] . '" alt="' . $lang['Visit_website'] . '" border="0" /></a>' : "&nbsp;";
  
  		$pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&amp;" . POST_USERS_URL . "=" . $profiledata['user_id']) . "\"><img src=\"". $images['icon_pm'] . "\" alt=\"" . $lang['Send_private_message'] . "\" border=\"0\" /></a>";
***************
*** 372,388 ****
  			"UL_SEARCH" => $search,
  			"SEARCH_IMG" => $search_img,
  			"ICQ_ADD_IMG" => $icq_add_img,
  			"ICQ_STATUS_IMG" => $icq_status_img,
! 			"AIM" => ( ($profiledata['user_aim']) ? $profiledata['user_aim'] : "&nbsp;" ),
  			"AIM_IMG" => $aim_img,
! 			"MSN" => ( ($profiledata['user_msnm']) ? $profiledata['user_msnm'] : "&nbsp;" ),
  			"MSN_IMG" => $msnm_img,
! 			"YIM" => ( ($profiledata['user_yim']) ? $profiledata['user_yim'] : "&nbsp;" ),
  			"YIM_IMG" => $yim_img,
! 			"WEBSITE" => ( ($profiledata['user_website']) ? $profiledata['user_website'] : "&nbsp;" ),
  			"WEBSITE_IMG" => $www_img,
! 			"LOCATION" => ( ($profiledata['user_from']) ? $profiledata['user_from'] : "&nbsp;" ),
! 			"OCCUPATION" => ( ($profiledata['user_occ']) ? $profiledata['user_occ'] : "&nbsp;" ),
! 			"INTERESTS" => ( ($profiledata['user_interests']) ? $profiledata['user_interests'] : "&nbsp;" ),
  			"AVATAR_IMG" => $avatar_img,
  
--- 355,373 ----
  			"UL_SEARCH" => $search,
  			"SEARCH_IMG" => $search_img,
+ 			"ICQ" => ( $profiledata['user_icq'] ) ? $profiledata['user_icq'] : "&nbsp;", 
+ 			"ICQ_IMG" => ( $profiledata['user_icq'] ) ? $images['icon_icq'] : "&nbsp;",
  			"ICQ_ADD_IMG" => $icq_add_img,
  			"ICQ_STATUS_IMG" => $icq_status_img,
! 			"AIM" => ( $profiledata['user_aim'] ) ? '<a href="aim:goim?screenname=' . $profiledata['user_aim'] . '&amp;message=Hello+Are+you+there?">' . $profiledata['user_aim'] . '</a>' : "&nbsp;",
  			"AIM_IMG" => $aim_img,
! 			"MSN" => ( $profiledata['user_msnm'] ) ? $profiledata['user_msnm'] : "&nbsp;",
  			"MSN_IMG" => $msnm_img,
! 			"YIM" => ( $profiledata['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $profiledata['user_yim'] . '&amp;.src=pg">' . $profiledata['user_yim'] . '</a>' : "&nbsp;",
  			"YIM_IMG" => $yim_img,
! 			"WEBSITE" => ( $profiledata['user_website'] ) ? '<a href="' . $profiledata['user_website'] . '" target="_phpbbwebsite">' . $profiledata['user_website'] . '</a>' : "&nbsp;",
  			"WEBSITE_IMG" => $www_img,
! 			"LOCATION" => ( $profiledata['user_from'] ) ? $profiledata['user_from'] : "&nbsp;",
! 			"OCCUPATION" => ( $profiledata['user_occ'] ) ? $profiledata['user_occ'] : "&nbsp;",
! 			"INTERESTS" => ( $profiledata['user_interests'] ) ? $profiledata['user_interests'] : "&nbsp;",
  			"AVATAR_IMG" => $avatar_img,
  
***************
*** 406,413 ****
  			"L_INTERESTS" => $lang['Interests'],
  
! 			"U_SEARCH_USER" => append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&amp;showresults=topics"),
  
  			"S_PROFILE_ACTION" => append_sid("profile.$phpEx"))
  		);
  
  		$template->pparse("body");
--- 391,401 ----
  			"L_INTERESTS" => $lang['Interests'],
  
! 			"U_SEARCH_USER" => append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&amp;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");

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.158
retrieving revision 1.159
diff -C2 -r1.158 -r1.159
*** viewtopic.php	2001/12/21 02:08:56	1.158
--- viewtopic.php	2001/12/24 18:11:20	1.159
***************
*** 856,874 ****
  		{
  			$icq_status_img = "<a href=\"http://wwp.icq.com/" . $postrow[$i]['user_icq'] . "#pager\"><img src=\"http://web.icq.com/whitepages/online?icq=" . $postrow[$i]['user_icq'] . "&amp;img=5\" width=\"18\" height=\"18\" border=\"0\" /></a>";
! 
! 			//
! 			// 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 = '<table width="59" border="0" cellspacing="0" cellpadding="0"><tr><td nowrap="nowrap" class="icqback"><img src="images/spacer.gif" width="3" height="18" alt = "" />' . $icq_status_img . '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $postrow[$i]['user_icq'] . '"><img src="images/spacer.gif" width="35" height="18" border="0" alt="' . $lang['ICQ'] . '" title="' . $lang['ICQ'] . '" /></a></td></tr></table>'; 
! 				$icq_status_img = "";
! 			}
! 			else
! 			{
! 				$icq_add_img = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $postrow[$i]['user_icq'] . "\"><img src=\"" . $images['icon_icq'] . "\" alt=\"" . $lang['ICQ'] . "\" title=\"" . $lang['ICQ'] . "\" border=\"0\" /></a>";
! 			}
  		}
  		else
--- 856,860 ----
  		{
  			$icq_status_img = "<a href=\"http://wwp.icq.com/" . $postrow[$i]['user_icq'] . "#pager\"><img src=\"http://web.icq.com/whitepages/online?icq=" . $postrow[$i]['user_icq'] . "&amp;img=5\" width=\"18\" height=\"18\" border=\"0\" /></a>";
! 			$icq_add_img = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $postrow[$i]['user_icq'] . "\"><img src=\"" . $images['icon_icq'] . "\" alt=\"" . $lang['ICQ'] . "\" title=\"" . $lang['ICQ'] . "\" border=\"0\" /></a>";
  		}
  		else
***************
*** 1077,1080 ****
--- 1063,1068 ----
  		"EMAIL_IMG" => $email_img,
  		"WWW_IMG" => $www_img,
+ 		"ICQ" => ( !empty($postrow[$i]['user_icq']) ) ? $postrow[$i]['user_icq'] : "&nbsp;", 
+ 		"ICQ_IMG" => ( !empty($postrow[$i]['user_icq']) ) ? $images['icon_icq'] : "&nbsp;",
  		"ICQ_STATUS_IMG" => $icq_status_img,
  		"ICQ_ADD_IMG" => $icq_add_img,

[Phpbb-checkins] CVS: phpBB2 privmsg.php,1.68,1.69 profile.php,1.160,1.161 viewtopic.php,1.158,1.159

phpBB is the world's leading open source discussion forum software.

[Phpbb-checkins] CVS: phpBB2 privmsg.php,1.68,1.69 profile.php,1.160,1.161 viewtopic.php,1.158,1.159