Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2/admin admin_users.php,1.43,1.44
|
From: Paul S. O. <ps...@us...> - 2002-02-12 17:12:47
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv12977/admin
Modified Files:
admin_users.php
Log Message:
Fix bug with auth access entries not being deleted along with user
Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** admin_users.php 12 Feb 2002 15:44:30 -0000 1.43
--- admin_users.php 12 Feb 2002 17:12:44 -0000 1.44
***************
*** 159,163 ****
$occupation = (!empty($HTTP_POST_VARS['occupation'])) ? trim(strip_tags($HTTP_POST_VARS['occupation'])) : "";
$interests = (!empty($HTTP_POST_VARS['interests'])) ? trim(strip_tags($HTTP_POST_VARS['interests'])) : "";
! $signature = (!empty($HTTP_POST_VARS['signature'])) ? trim(strip_tags(str_replace("<br />", "\n", $HTTP_POST_VARS['signature']))) : "";
validate_optional_fields($icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature);
--- 159,163 ----
$occupation = (!empty($HTTP_POST_VARS['occupation'])) ? trim(strip_tags($HTTP_POST_VARS['occupation'])) : "";
$interests = (!empty($HTTP_POST_VARS['interests'])) ? trim(strip_tags($HTTP_POST_VARS['interests'])) : "";
! $signature = (!empty($HTTP_POST_VARS['signature'])) ? trim(str_replace("<br />", "\n", $HTTP_POST_VARS['signature'])) : "";
validate_optional_fields($icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature);
***************
*** 286,291 ****
{
// User is (made) inactive. Delete all their sessions.
! $sql = "DELETE FROM ". SESSIONS_TABLE ." WHERE session_user_id = $user_id";
! if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't delete this user's sessions", "", __LINE__, __FILE__, $sql);
--- 286,292 ----
{
// 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, "Couldn't delete this user's sessions", "", __LINE__, __FILE__, $sql);
***************
*** 296,315 ****
{
$sig_length_check = preg_replace("/(\[.*?)(=.*?)\]/is", "\\1]", stripslashes($signature));
! if( $board_config['allow_html'] )
{
$sig_length_check = preg_replace("/(\<.*?)(=.*?)( .*?=.*?)?([ \/]?\>)/is", "\\1\\3\\4", $sig_length_check);
}
// Only create a new bbcode_uid when there was no uid yet.
! if($signature_bbcode_uid == '')
{
! $signature_bbcode_uid = ( $board_config['allow_bbcode'] ) ? make_bbcode_uid() : "";
}
! $signature = prepare_message($signature, $board_config['allow_html'], $board_config['allow_bbcode'], $board_config['allow_smilies'], $signature_bbcode_uid);
! if( strlen($sig_length_check) > $board_config['max_sig_chars'] )
! {
$error = TRUE;
! if( isset($error_msg) )
{
$error_msg .= "<br />";
--- 297,317 ----
{
$sig_length_check = preg_replace("/(\[.*?)(=.*?)\]/is", "\\1]", stripslashes($signature));
! if ( $allowhtml )
{
$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.
! if ( $signature_bbcode_uid == '' )
{
! $signature_bbcode_uid = ( $allowbbcode ) ? make_bbcode_uid() : "";
}
! $signature = prepare_message($signature, $allowhtml, $allowbbcode, $allowsmilies, $signature_bbcode_uid);
! if ( strlen($sig_length_check) > $board_config['max_sig_chars'] )
! {
$error = TRUE;
! if ( isset($error_msg) )
{
$error_msg .= "<br />";
***************
*** 598,602 ****
AND g.group_id = ug.group_id
AND g.group_single_user = 1";
! if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't obtain group information for this user", "", __LINE__, __FILE__, $sql);
--- 600,604 ----
AND g.group_id = ug.group_id
AND g.group_single_user = 1";
! if( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, "Couldn't obtain group information for this user", "", __LINE__, __FILE__, $sql);
***************
*** 606,669 ****
$sql = "UPDATE " . POSTS_TABLE . "
! SET poster_id = '-1', post_username = '$username'
WHERE poster_id = $user_id";
! if( $result = $db->sql_query($sql) )
{
! $sql = "UPDATE " . TOPICS_TABLE . "
! SET topic_poster = '-1'
! WHERE topic_poster = $user_id";
! if( $result = $db->sql_query($sql) )
! {
! $sql = "DELETE FROM " . USERS_TABLE . "
! WHERE user_id = $user_id";
! if( $result = $db->sql_query($sql) )
! {
! $sql = "DELETE FROM " . USER_GROUP_TABLE . "
! WHERE user_id = $user_id";
! if( $result = $db->sql_query($sql) )
! {
! $sql = "DELETE FROM " . GROUPS_TABLE . "
! WHERE group_id = " . $row['group_id'];
! if( $result = $db->sql_query($sql) )
! {
! $sql = "DELETE FROM " . TOPICS_WATCH_TABLE . "
! WHERE user_id = $user_id";
! $result = @$db->sql_query($sql);
! $message = $lang['User_deleted'];
! }
! else
! {
! $error = TRUE;
! }
! }
! else
! {
! $error = TRUE;
! }
! }
! else
! {
! $error = TRUE;
! }
! }
! else
! {
! $error = TRUE;
! }
}
! else
{
! $error = TRUE;
}
! if( $error == TRUE )
{
! if( isset($error_msg) )
! {
! $error_msg .= "<br />";
! }
! $error_msg .= $lang['Admin_user_fail'];
}
}
else
--- 608,663 ----
$sql = "UPDATE " . POSTS_TABLE . "
! SET poster_id = " . ANONYMOUS . ", post_username = '$username'
WHERE poster_id = $user_id";
! if( !$db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't update posts for this user", "", __LINE__, __FILE__, $sql);
! }
! $sql = "UPDATE " . TOPICS_TABLE . "
! SET topic_poster = " . ANONYMOUS . "
! WHERE topic_poster = $user_id";
! if( !$db->sql_query($sql) )
! {
! message_die(GENERAL_ERROR, "Couldn't update topics for this user", "", __LINE__, __FILE__, $sql);
}
!
! $sql = "DELETE FROM " . USERS_TABLE . "
! WHERE user_id = $user_id";
! if( !$db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't delete user", "", __LINE__, __FILE__, $sql);
}
! $sql = "DELETE FROM " . USER_GROUP_TABLE . "
! WHERE user_id = $user_id";
! if( !$db->sql_query($sql) )
{
! message_die(GENERAL_ERROR, "Couldn't delete user from user_group table", "", __LINE__, __FILE__, $sql);
! }
!
! $sql = "DELETE FROM " . GROUPS_TABLE . "
! WHERE group_id = " . $row['group_id'];
! if( !$db->sql_query($sql) )
! {
! message_die(GENERAL_ERROR, "Couldn't delete group for this user", "", __LINE__, __FILE__, $sql);
! }
!
! $sql = "DELETE FROM " . AUTH_ACCESS_TABLE . "
! WHERE group_id = " . $row['group_id'];
! if( !$db->sql_query($sql) )
! {
! message_die(GENERAL_ERROR, "Couldn't delete group for this user", "", __LINE__, __FILE__, $sql);
}
+
+ $sql = "DELETE FROM " . TOPICS_WATCH_TABLE . "
+ WHERE user_id = $user_id";
+ if ( !$db->sql_query($sql) )
+ {
+ message_die(GENERAL_ERROR, "Couldn't delete user from topic watch table", "", __LINE__, __FILE__, $sql);
+ }
+
+ $message = $lang['User_deleted'];
+
}
else
|
