phpBB

Code Changes

File: includes/functions_user.php

  Unmodified   Added   Modified   Removed
Line 461Line 461
	* @var	array	user_ids	IDs of the deleted user
* @var mixed retain_username True if username should be retained
* or false if not

	* @var	array	user_ids	IDs of the deleted user
* @var mixed retain_username True if username should be retained
* or false if not

 
	* @var	array	user_rows	Array containing data of the deleted users

	* @since 3.1.0-a1

	* @since 3.1.0-a1

 
	* @changed 3.2.4-RC1 Added user_rows

	*/

	*/

	$vars = array('mode', 'user_ids', 'retain_username');

	$vars = array('mode', 'user_ids', 'retain_username', 'user_rows');

	extract($phpbb_dispatcher->trigger_event('core.delete_user_before', compact($vars)));

// Before we begin, we will remove the reports the user issued.

	extract($phpbb_dispatcher->trigger_event('core.delete_user_before', compact($vars)));

// Before we begin, we will remove the reports the user issued.

Line 664Line 666
		delete_posts('poster_id', $user_ids);
}


		delete_posts('poster_id', $user_ids);
}


	$table_ary = array(USERS_TABLE, USER_GROUP_TABLE, TOPICS_WATCH_TABLE, FORUMS_WATCH_TABLE, ACL_USERS_TABLE, TOPICS_TRACK_TABLE, TOPICS_POSTED_TABLE, FORUMS_TRACK_TABLE, PROFILE_FIELDS_DATA_TABLE, MODERATOR_CACHE_TABLE, DRAFTS_TABLE, BOOKMARKS_TABLE, SESSIONS_KEYS_TABLE, PRIVMSGS_FOLDER_TABLE, PRIVMSGS_RULES_TABLE);

	$table_ary = array(USERS_TABLE, USER_GROUP_TABLE, TOPICS_WATCH_TABLE, FORUMS_WATCH_TABLE, ACL_USERS_TABLE, TOPICS_TRACK_TABLE, TOPICS_POSTED_TABLE, FORUMS_TRACK_TABLE, PROFILE_FIELDS_DATA_TABLE, MODERATOR_CACHE_TABLE, DRAFTS_TABLE, BOOKMARKS_TABLE, SESSIONS_KEYS_TABLE, PRIVMSGS_FOLDER_TABLE, PRIVMSGS_RULES_TABLE, $phpbb_container->getParameter('tables.auth_provider_oauth_token_storage'), $phpbb_container->getParameter('tables.auth_provider_oauth_states'), $phpbb_container->getParameter('tables.auth_provider_oauth_account_assoc'));


// Delete the miscellaneous (non-post) data for the user
foreach ($table_ary as $table)


// Delete the miscellaneous (non-post) data for the user
foreach ($table_ary as $table)

Line 1427Line 1429
		return '';
}


		return '';
}


	if (preg_match(get_preg_expression('ipv4'), $ip))
{
// IPv4 address
$whois_host = 'whois.arin.net.';
}
else if (preg_match(get_preg_expression('ipv6'), $ip))
{
// IPv6 address
$whois_host = 'whois.sixxs.net.';
}
else

	if (!preg_match(get_preg_expression('ipv4'), $ip) && !preg_match(get_preg_expression('ipv6'), $ip))











	{
return '';
}

	{
return '';
}

 

// IPv4 & IPv6 addresses
$whois_host = 'whois.arin.net.';


$ipwhois = '';



$ipwhois = '';


Line 3600Line 3595
		{
$user_data = $user_row;
}

		{
$user_data = $user_row;
}

	}

if (empty($user_data['user_new']))
{
return false;

 
	}

$sql = 'SELECT group_id

	}

$sql = 'SELECT group_id