makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 04:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ensure default group_id is set for new users

Browse source 
git-svn-id: file:///svn/phpbb/trunk@4913 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2004-06-07 11:43:51 +00:00
parent c2834abfae
commit 4acbb74b4a
1 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
phpBB/includes/ucp/ucp_register.php
View file

@ -158,6 +158,25 @@ class ucp_register extends module
{ {
$server_url = generate_board_url(); $server_url = generate_board_url();
// Which group by default?
$group_reg = ($coppa) ? 'REGISTERED_COPPA' : 'REGISTERED';
$group_inactive = ($coppa) ? 'INACTIVE_COPPA' : 'INACTIVE';
$group_name = ($config['require_activation'] == USER_ACTIVATION_NONE) ? $group_reg : $group_inactive;
$sql = 'SELECT group_id
FROM ' . GROUPS_TABLE . "
WHERE group_name = '$group_name'
AND group_type = " . GROUP_SPECIAL;
$result = $db->sql_query($sql);
if (!($row = $db->sql_fetchrow($result)))
{
trigger_error($user->lang['NO_GROUP']);
}
$db->sql_freeresult($result);
$group_id = $row['group_id'];
if (($coppa || if (($coppa ||
$config['require_activation'] == USER_ACTIVATION_SELF || $config['require_activation'] == USER_ACTIVATION_SELF ||
$config['require_activation'] == USER_ACTIVATION_ADMIN) && $config['email_enable']) $config['require_activation'] == USER_ACTIVATION_ADMIN) && $config['email_enable'])
@ -182,6 +201,7 @@ class ucp_register extends module
'user_password' => md5($new_password), 'user_password' => md5($new_password),
'user_email' => $email, 'user_email' => $email,
'user_email_hash' => (int) crc32(strtolower($email)) . strlen($email), 'user_email_hash' => (int) crc32(strtolower($email)) . strlen($email),
'group_id' => (int) $group_id,
'user_timezone' => (float) $tz, 'user_timezone' => (float) $tz,
'user_lang' => $lang, 'user_lang' => $lang,
'user_allow_pm' => 1, 'user_allow_pm' => 1,
@ -205,15 +225,12 @@ class ucp_register extends module
} }
// Place into appropriate group, either REGISTERED(_COPPA) or INACTIVE(_COPPA) depending on config // Place into appropriate group, either REGISTERED(_COPPA) or INACTIVE(_COPPA) depending on config
$group_reg = ($coppa) ? 'REGISTERED_COPPA' : 'REGISTERED'; $sql = 'INSERT INTO ' . USER_GROUP_TABLE . ' ' . $db->sql_build_array('INSERT', array(
$group_inactive = ($coppa) ? 'INACTIVE_COPPA' : 'INACTIVE'; 'user_id' => (int) $user_id,
$group_name = ($config['require_activation'] == USER_ACTIVATION_NONE) ? $group_reg : $group_inactive; 'group_id' => (int) $group_id,
$sql = 'INSERT INTO ' . USER_GROUP_TABLE . " (user_id, group_id, user_pending) 'user_pending' => 0)
SELECT $user_id, group_id, 0 );
FROM " . GROUPS_TABLE . " $db->sql_query($sql);
WHERE group_name = '$group_name'
AND group_type = " . GROUP_SPECIAL;
$result = $db->sql_query($sql);
$db->sql_transaction('commit'); $db->sql_transaction('commit');