diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2004-06-07 11:43:51 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2004-06-07 11:43:51 +0000 |
| commit | 4acbb74b4aa50908d71dce7d28c3f9f46ce47a3c (patch) | |
| tree | 03a9fb55c694992159c69c89d61ed004f3118c37 /phpBB/includes | |
| parent | c2834abfae4ac9bc02cb245d1bdb5bf78802ec26 (diff) | |
| download | forums-4acbb74b4aa50908d71dce7d28c3f9f46ce47a3c.tar forums-4acbb74b4aa50908d71dce7d28c3f9f46ce47a3c.tar.gz forums-4acbb74b4aa50908d71dce7d28c3f9f46ce47a3c.tar.bz2 forums-4acbb74b4aa50908d71dce7d28c3f9f46ce47a3c.tar.xz forums-4acbb74b4aa50908d71dce7d28c3f9f46ce47a3c.zip | |
Ensure default group_id is set for new users
git-svn-id: file:///svn/phpbb/trunk@4913 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 7b3f4477c5..c1b2aa8494 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -158,6 +158,25 @@ class ucp_register extends module { $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 || $config['require_activation'] == USER_ACTIVATION_SELF || $config['require_activation'] == USER_ACTIVATION_ADMIN) && $config['email_enable']) @@ -182,6 +201,7 @@ class ucp_register extends module 'user_password' => md5($new_password), 'user_email' => $email, 'user_email_hash' => (int) crc32(strtolower($email)) . strlen($email), + 'group_id' => (int) $group_id, 'user_timezone' => (float) $tz, 'user_lang' => $lang, '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 - $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 = 'INSERT INTO ' . USER_GROUP_TABLE . " (user_id, group_id, user_pending) - SELECT $user_id, group_id, 0 - FROM " . GROUPS_TABLE . " - WHERE group_name = '$group_name' - AND group_type = " . GROUP_SPECIAL; - $result = $db->sql_query($sql); + $sql = 'INSERT INTO ' . USER_GROUP_TABLE . ' ' . $db->sql_build_array('INSERT', array( + 'user_id' => (int) $user_id, + 'group_id' => (int) $group_id, + 'user_pending' => 0) + ); + $db->sql_query($sql); $db->sql_transaction('commit'); |