mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-08 00:25:19 +02:00
Code Issues Releases Wiki Activity

Ok, by this time, bugs 397, 427, 429, 450, and 472 should be fixed.

Browse Source 
--Doug


git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@2649 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
dougk_ff7 2002-06-27 22:54:10 +00:00
parent a144cb10a5
commit 81bb18f372
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
phpBB/admin/admin_users.php
View File

@ -201,17 +201,6 @@ if( $mode == 'edit' || $mode == 'save' && ( isset($HTTP_POST_VARS['username']) |
$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Password_mismatch']; $error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Password_mismatch'];
} }
if( $user_status == 0 )
{
// User is (made) inactive. Delete all their sessions.
$sql = "DELETE FROM " . SESSIONS_TABLE . "
WHERE session_user_id = $user_id";
if( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Could not delete this users sessions', '', __LINE__, __FILE__, $sql);
}
}
if( $signature != "" ) if( $signature != "" )
{ {
$sig_length_check = preg_replace('/(\[.*?)(=.*?)\]/is', '\\1]', stripslashes($signature)); $sig_length_check = preg_replace('/(\[.*?)(=.*?)\]/is', '\\1]', stripslashes($signature));
@ -219,7 +208,6 @@ if( $mode == 'edit' || $mode == 'save' && ( isset($HTTP_POST_VARS['username']) |
{ {
$sig_length_check = preg_replace('/(\<.*?)(=.*?)( .*?=.*?)?([ \/]?\>)/is', '\\1\\3\\4', $sig_length_check); $sig_length_check = preg_replace('/(\<.*?)(=.*?)( .*?=.*?)?([ \/]?\>)/is', '\\1\\3\\4', $sig_length_check);
} }
$sig_length_check = preg_replace('/(\[.*?)(=.*?)\]/is', '\\1]', stripslashes($signature));
// Only create a new bbcode_uid when there was no uid yet. // Only create a new bbcode_uid when there was no uid yet.
if ( $signature_bbcode_uid == '' ) if ( $signature_bbcode_uid == '' )
@ -235,9 +223,6 @@ if( $mode == 'edit' || $mode == 'save' && ( isset($HTTP_POST_VARS['username']) |
} }
} }
//
// Avatar stuff
//
// //
// Avatar stuff // Avatar stuff
// //
@ -1123,7 +1108,7 @@ if( $mode == 'edit' || $mode == 'save' && ( isset($HTTP_POST_VARS['username']) |
'S_PROFILE_ACTION' => append_sid("admin_users.$phpEx")) 'S_PROFILE_ACTION' => append_sid("admin_users.$phpEx"))
); );
if( file_exists('./../' . $board_config['avatar_path'] ) ) if( file_exists('./../' . $board_config['avatar_path'] ) && ($board_config['allow_avatar_upload'] == TRUE) )
{ {
if ( $form_enctype != '' ) if ( $form_enctype != '' )
{ {
@ -1132,10 +1117,15 @@ if( $mode == 'edit' || $mode == 'save' && ( isset($HTTP_POST_VARS['username']) |
$template->assign_block_vars('avatar_remote_upload', array() ); $template->assign_block_vars('avatar_remote_upload', array() );
} }
if( file_exists('./../' . $board_config['avatar_gallery_path'] ) ) if( file_exists('./../' . $board_config['avatar_gallery_path'] ) && ($board_config['allow_avatar_local'] == TRUE) )
{ {
$template->assign_block_vars('avatar_local_gallery', array() ); $template->assign_block_vars('avatar_local_gallery', array() );
} }
if( $board_config['allow_avatar_remote'] == TRUE )
{
$template->assign_block_vars('avatar_remote_link', array() );
}
} }
$template->pparse('body'); $template->pparse('body');

2
phpBB/templates/subSilver/admin/user_edit_body.tpl
View File

@ -240,12 +240,14 @@
</td> </td>
</tr> </tr>
<!-- END avatar_remote_upload --> <!-- END avatar_remote_upload -->
<!-- BEGIN avatar_remote_link -->
<tr> <tr>
<td class="row1"><span class="gen">{L_LINK_REMOTE_AVATAR}</span></td> <td class="row1"><span class="gen">{L_LINK_REMOTE_AVATAR}</span></td>
<td class="row2"> <td class="row2">
<input type="text" name="avatarremoteurl" size="40" class="post" style="width: 200px" /> <input type="text" name="avatarremoteurl" size="40" class="post" style="width: 200px" />
</td> </td>
</tr> </tr>
<!-- END avatar_remote_link -->
<!-- BEGIN avatar_local_gallery --> <!-- BEGIN avatar_local_gallery -->
<tr> <tr>
<td class="row1"><span class="gen">{L_AVATAR_GALLERY}</span></td> <td class="row1"><span class="gen">{L_AVATAR_GALLERY}</span></td>