diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-11 18:13:52 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-11 18:13:52 +0000 |
| commit | 01b41453812dc7b990f03b81f85dcfb9a18076fd (patch) | |
| tree | d12e93524fa7625d1220088d34a5a957cd618624 /phpBB/includes/ucp/ucp_activate.php | |
| parent | ce3b07eee7dbefc68dcd8eab3ab667e6532c8561 (diff) | |
| download | forums-01b41453812dc7b990f03b81f85dcfb9a18076fd.tar forums-01b41453812dc7b990f03b81f85dcfb9a18076fd.tar.gz forums-01b41453812dc7b990f03b81f85dcfb9a18076fd.tar.bz2 forums-01b41453812dc7b990f03b81f85dcfb9a18076fd.tar.xz forums-01b41453812dc7b990f03b81f85dcfb9a18076fd.zip | |
- fixed a few bugs
- added user_add() function
- check posted images ([img]) for same domain/scipt and php files
- auth_api.html updated to the coding guidelines look&feel
- introduced ability to force non page-updates (cron is using it)
- correctly resend coppa email
git-svn-id: file:///svn/phpbb/trunk@6048 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_activate.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_activate.php | 76 |
1 files changed, 31 insertions, 45 deletions
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php index f9f39f4663..87e6cb8169 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/phpBB/includes/ucp/ucp_activate.php @@ -15,9 +15,12 @@ */ class ucp_activate { + var $u_action; + function main($id, $mode) { - global $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx; + global $config, $phpbb_root_path, $phpEx; + global $db, $user, $auth, $template; $user_id = request_var('u', 0); $key = request_var('k', ''); @@ -26,60 +29,64 @@ class ucp_activate FROM ' . USERS_TABLE . " WHERE user_id = $user_id"; $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); + $user_row = $db->sql_fetchrow($result); $db->sql_freeresult($result); - if (!$row) + if (!$user_row) { - trigger_error($user->lang['NO_USER']); + trigger_error('NO_USER'); } - if ($row['user_type'] <> USER_INACTIVE && !$row['user_newpasswd']) + if ($user_row['user_type'] <> USER_INACTIVE && !$user_row['user_newpasswd']) { meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); - trigger_error($user->lang['ALREADY_ACTIVATED']); + trigger_error('ALREADY_ACTIVATED'); } - - if ($row['user_actkey'] != $key) + + if ($user_row['user_actkey'] != $key) { - trigger_error($user->lang['WRONG_ACTIVATION']); + trigger_error('WRONG_ACTIVATION'); } - $update_password = ($row['user_newpasswd']) ? true : false; + $update_password = ($user_row['user_newpasswd']) ? true : false; if ($update_password) { $sql_ary = array( 'user_type' => USER_NORMAL, 'user_actkey' => '', - 'user_password' => $row['user_newpasswd'], + 'user_password' => $user_row['user_newpasswd'], 'user_newpasswd' => '' ); - - $sql = 'UPDATE ' . USERS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE user_id = ' . $row['user_id']; - $result = $db->sql_query($sql); + + $sql = 'UPDATE ' . USERS_TABLE . ' + SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' + WHERE user_id = ' . $user_row['user_id']; + $db->sql_query($sql); } - // TODO: check for group membership after password update... active_flip there too if (!$update_password) { + include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx); + // Now we need to demote the user from the inactive group and add him to the registered group + user_active_flip($user_row['user_id'], $user_row['user_type'], '', $user_row['username'], true); - include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx); - user_active_flip($row['user_id'], $row['user_type'], '', $row['username'], true); + // Update last username + update_last_username(); + set_config('num_users', $config['num_users'] + 1, true); } if ($config['require_activation'] == USER_ACTIVATION_ADMIN && !$update_password) { - include_once($phpbb_root_path . 'includes/functions_messenger.'.$phpEx); + include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - $messenger = new messenger(); + $messenger = new messenger(false); - $messenger->template('admin_welcome_activated', $row['user_lang']); + $messenger->template('admin_welcome_activated', $user_row['user_lang']); $messenger->replyto($config['board_contact']); - $messenger->to($row['user_email'], $row['username']); + $messenger->to($user_row['user_email'], $user_row['username']); $messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); $messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']); @@ -88,13 +95,12 @@ class ucp_activate $messenger->assign_vars(array( 'SITENAME' => $config['sitename'], - 'USERNAME' => html_entity_decode($row['username']), + 'USERNAME' => html_entity_decode($user_row['username']), 'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig'])) ); - $messenger->send($row['user_notify_type']); - $messenger->save_queue(); + $messenger->send($user_row['user_notify_type']); $message = 'ACCOUNT_ACTIVE_ADMIN'; } @@ -103,26 +109,6 @@ class ucp_activate $message = (!$update_password) ? 'ACCOUNT_ACTIVE' : 'PASSWORD_ACTIVATED'; } - if (!$update_password) - { - // Get latest username - $sql = 'SELECT user_id, username - FROM ' . USERS_TABLE . ' - WHERE user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ') - ORDER BY user_id DESC'; - $result = $db->sql_query_limit($sql, 1); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if ($row) - { - set_config('newest_user_id', $row['user_id'], true); - set_config('newest_username', $row['username'], true); - } - - set_config('num_users', $config['num_users'] + 1, true); - } - meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); trigger_error($user->lang[$message]); } |