mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
Fixed bug #471044 and problem with coppa support upon registration when using avatar gallery
git-svn-id: file:///svn/phpbb/trunk@1187 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
fe67a082f8
commit
e25574fc9c
2 changed files with 12 additions and 10 deletions
|
@ -201,7 +201,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
|
||||||
{
|
{
|
||||||
message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']);
|
message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']);
|
||||||
}
|
}
|
||||||
$profiledata = get_userdata_from_id($HTTP_GET_VARS[POST_USERS_URL]);
|
$profiledata = get_userdata_from_id(intval($HTTP_GET_VARS[POST_USERS_URL]));
|
||||||
|
|
||||||
$sql = "SELECT *
|
$sql = "SELECT *
|
||||||
FROM " . RANKS_TABLE . "
|
FROM " . RANKS_TABLE . "
|
||||||
|
@ -347,7 +347,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
|
||||||
|
|
||||||
$msnm_img = ($profiledata['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\" alt=\"" . $lang['MSNM'] . "\" /></a>" : " ";
|
$msnm_img = ($profiledata['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\" alt=\"" . $lang['MSNM'] . "\" /></a>" : " ";
|
||||||
|
|
||||||
$yim_img = ($members[$i]['user_yim']) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $members[$i]['user_yim'] . "&.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\" alt=\"" . $lang['YIM'] . "\" /></a>" : " ";
|
$yim_img = ( $profiledata['user_yim'] ) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $members[$i]['user_yim'] . "&.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\" alt=\"" . $lang['YIM'] . "\" /></a>" : " ";
|
||||||
|
|
||||||
$search_img = "<a href=\"" . append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&showresults=topics") . "\"><img src=\"" . $images['icon_search'] . "\" border=\"0\" alt=\"" . $lang['Search_user_posts'] . "\" /></a>";
|
$search_img = "<a href=\"" . append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&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']) . "&showresults=topics") . "\">" . $lang['Search_user_posts'] . "</a>";
|
$search = "<a href=\"" . append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&showresults=topics") . "\">" . $lang['Search_user_posts'] . "</a>";
|
||||||
|
@ -391,7 +391,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
|
||||||
"L_CONTACT" => $lang['Contact'],
|
"L_CONTACT" => $lang['Contact'],
|
||||||
"L_EMAIL_ADDRESS" => $lang['Email_address'],
|
"L_EMAIL_ADDRESS" => $lang['Email_address'],
|
||||||
"L_EMAIL" => $lang['Email'],
|
"L_EMAIL" => $lang['Email'],
|
||||||
"L_PM" => $lang['Private_message'],
|
"L_SEND_PM" => $lang['Send_private_message'],
|
||||||
"L_ICQ_NUMBER" => $lang['ICQ'],
|
"L_ICQ_NUMBER" => $lang['ICQ'],
|
||||||
"L_YAHOO" => $lang['YIM'],
|
"L_YAHOO" => $lang['YIM'],
|
||||||
"L_AIM" => $lang['AIM'],
|
"L_AIM" => $lang['AIM'],
|
||||||
|
@ -465,7 +465,7 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
|
||||||
{
|
{
|
||||||
if( $mode == "editprofile" )
|
if( $mode == "editprofile" )
|
||||||
{
|
{
|
||||||
$user_id = $HTTP_POST_VARS['user_id'];
|
$user_id = intval($HTTP_POST_VARS['user_id']);
|
||||||
$current_email = trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['current_email'])));
|
$current_email = trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['current_email'])));
|
||||||
}
|
}
|
||||||
$username = (!empty($HTTP_POST_VARS['username'])) ? trim(strip_tags($HTTP_POST_VARS['username'])) : "";
|
$username = (!empty($HTTP_POST_VARS['username'])) ? trim(strip_tags($HTTP_POST_VARS['username'])) : "";
|
||||||
|
@ -1327,8 +1327,10 @@ if( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$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'] . '" />';
|
$coppa = ( ( !$HTTP_POST_VARS['coppa'] && !$HTTP_GET_VARS['coppa'] ) || $mode == "register") ? 0 : TRUE;
|
||||||
$s_hidden_vars = '<input type="hidden" name="user_id" value="' . $user_id . '" />';
|
|
||||||
|
$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="username" value="' . addslashes($username) . '" />';
|
||||||
$s_hidden_vars .= '<input type="hidden" name="email" value="' . addslashes($email) . '" />';
|
$s_hidden_vars .= '<input type="hidden" name="email" value="' . addslashes($email) . '" />';
|
||||||
$s_hidden_vars .= '<input type="hidden" name="icq" value="' . addslashes($icq) . '" />';
|
$s_hidden_vars .= '<input type="hidden" name="icq" value="' . addslashes($icq) . '" />';
|
||||||
|
|
|
@ -63,19 +63,19 @@
|
||||||
<td class="row1" valign="middle"><b><span class="gen">{PM_IMG}</span></b></td>
|
<td class="row1" valign="middle"><b><span class="gen">{PM_IMG}</span></b></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td valign="middle" align="right"><span class="gen">{L_MESSENGER}:</span></td>
|
<td valign="middle" nowrap="nowrap" align="right"><span class="gen">{L_MESSENGER}:</span></td>
|
||||||
<td class="row1" valign="middle"><span class="gen">{MSN_IMG}</span></td>
|
<td class="row1" valign="middle"><span class="gen">{MSN_IMG}</span></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td valign="middle" align="right"><span class="gen">{L_YAHOO}:</span></td>
|
<td valign="middle" nowrap="nowrap" align="right"><span class="gen">{L_YAHOO}:</span></td>
|
||||||
<td class="row1" valign="middle"><span class="gen">{YIM_IMG}</span></td>
|
<td class="row1" valign="middle"><span class="gen">{YIM_IMG}</span></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td valign="middle" align="right"><span class="gen">{L_AIM}:</span></td>
|
<td valign="middle" nowrap="nowrap" align="right"><span class="gen">{L_AIM}:</span></td>
|
||||||
<td class="row1" valign="middle"><span class="gen">{AIM_IMG}</span></td>
|
<td class="row1" valign="middle"><span class="gen">{AIM_IMG}</span></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td valign="middle" align="right"><span class="gen">{L_ICQ_NUMBER}:</span></td>
|
<td valign="middle" nowrap="nowrap" align="right"><span class="gen">{L_ICQ_NUMBER}:</span></td>
|
||||||
<td class="row1" valign="middle"><span class="gen">{ICQ_STATUS_IMG}{ICQ_ADD_IMG}</span></td>
|
<td class="row1" valign="middle"><span class="gen">{ICQ_STATUS_IMG}{ICQ_ADD_IMG}</span></td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
Loading…
Add table
Reference in a new issue