[Phpbb-checkins] CVS: phpBB2 profile.php,1.116,1.117

[Paul S. O. <ps...@us...>]

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

Modified Files:
	profile.php 
Log Message:
Fixed bug #471044 and problem with coppa support upon registration when using avatar gallery

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -r1.116 -r1.117
*** profile.php	2001/10/11 22:22:28	1.116
--- profile.php	2001/10/14 16:30:41	1.117
***************
*** 202,206 ****
  			message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']);
  		}
! 		$profiledata = get_userdata_from_id($HTTP_GET_VARS[POST_USERS_URL]);
  
  		$sql = "SELECT *
--- 202,206 ----
  			message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']);
  		}
! 		$profiledata = get_userdata_from_id(intval($HTTP_GET_VARS[POST_USERS_URL]));
  
  		$sql = "SELECT *
***************
*** 348,352 ****
  		$msnm_img = ($profiledata['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\" alt=\"" . $lang['MSNM'] . "\" /></a>" : "&nbsp;";
  
! 		$yim_img = ($members[$i]['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>";
--- 348,352 ----
  		$msnm_img = ($profiledata['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\" alt=\"" . $lang['MSNM'] . "\" /></a>" : "&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>";
***************
*** 392,396 ****
  			"L_EMAIL_ADDRESS" => $lang['Email_address'],
  			"L_EMAIL" => $lang['Email'],
! 			"L_PM" => $lang['Private_message'],
  			"L_ICQ_NUMBER" => $lang['ICQ'],
  			"L_YAHOO" => $lang['YIM'],
--- 392,396 ----
  			"L_EMAIL_ADDRESS" => $lang['Email_address'],
  			"L_EMAIL" => $lang['Email'],
! 			"L_SEND_PM" => $lang['Send_private_message'],
  			"L_ICQ_NUMBER" => $lang['ICQ'],
  			"L_YAHOO" => $lang['YIM'],
***************
*** 466,470 ****
  			if( $mode == "editprofile" )
  			{
! 				$user_id = $HTTP_POST_VARS['user_id'];
  				$current_email = trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['current_email'])));
  			}
--- 466,470 ----
  			if( $mode == "editprofile" )
  			{
! 				$user_id = intval($HTTP_POST_VARS['user_id']);
  				$current_email = trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['current_email'])));
  			}
***************
*** 1328,1333 ****
  				}
  
! 				$s_hidden_fields = '<input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" /><input type="hidden" name="user_id" value="' . $userdata['user_id'] . '" /><input type="hidden" name="current_email" value="' . $userdata['user_email'] . '" />';
! 				$s_hidden_vars = '<input type="hidden" name="user_id" value="' . $user_id . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="username" value="' . addslashes($username) . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="email" value="' . addslashes($email) . '" />';
--- 1328,1335 ----
  				}
  
! 				$coppa = ( ( !$HTTP_POST_VARS['coppa'] && !$HTTP_GET_VARS['coppa'] ) || $mode == "register") ? 0 : TRUE;
! 
! 				$s_hidden_vars = '<input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" /><input type="hidden" name="user_id" value="' . $userdata['user_id'] . '" /><input type="hidden" name="current_email" value="' . $userdata['user_email'] . '" />';
! 				$s_hidden_vars .= '<input type="hidden" name="user_id" value="' . $user_id . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="username" value="' . addslashes($username) . '" />';
  				$s_hidden_vars .= '<input type="hidden" name="email" value="' . addslashes($email) . '" />';