diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2006-09-23 12:27:51 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-09-23 12:27:51 +0000 |
| commit | cbece78f7b180253af95071ab859c468ed061ff5 (patch) | |
| tree | 420dcaac9aadf3144a4a65ced3f1bd25be10054e /phpBB/includes/ucp | |
| parent | 36fa521f9230d2b2a8bbb6dc79185cfc17112f39 (diff) | |
| download | forums-cbece78f7b180253af95071ab859c468ed061ff5.tar forums-cbece78f7b180253af95071ab859c468ed061ff5.tar.gz forums-cbece78f7b180253af95071ab859c468ed061ff5.tar.bz2 forums-cbece78f7b180253af95071ab859c468ed061ff5.tar.xz forums-cbece78f7b180253af95071ab859c468ed061ff5.zip | |
A reworking of how we handle inactive users
git-svn-id: file:///svn/phpbb/trunk@6394 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_activate.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 26 |
3 files changed, 21 insertions, 13 deletions
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php index 5f7ba150f4..b3c857b5d8 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/phpBB/includes/ucp/ucp_activate.php @@ -70,7 +70,7 @@ class ucp_activate 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); + user_active_flip($user_row['user_id'], $user_row['user_type'], '', $user_row['username'], 0, true); // Update last username update_last_username(); diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index e070ba8453..e9ef944986 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -180,8 +180,10 @@ class ucp_profile $messenger->save_queue(); $sql_ary += array( - 'user_type' => USER_INACTIVE, - 'user_actkey' => $user_actkey + 'user_type' => USER_INACTIVE, + 'user_actkey' => $user_actkey, + 'user_inactive_reason' => INACTIVE_PROFILE, + 'user_inactive_time' => time(), ); } diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 2638ea2ffe..0e0849982e 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -239,24 +239,30 @@ class ucp_register $key_len = ($key_len < 6) ? 6 : $key_len; $user_actkey = substr($user_actkey, 0, $key_len); $user_type = USER_INACTIVE; + $user_inactive_reason = INACTIVE_REGISTER; + $user_inactive_time = time(); } else { $user_type = USER_NORMAL; $user_actkey = ''; + $user_inactive_reason = 0; + $user_inactive_time = 0; } $user_row = array( - 'username' => $username, - 'user_password' => md5($new_password), - 'user_email' => $email, - 'group_id' => (int) $group_id, - 'user_timezone' => (float) $tz, - 'user_lang' => $lang, - 'user_type' => $user_type, - 'user_actkey' => $user_actkey, - 'user_ip' => $user->ip, - 'user_regdate' => time(), + 'username' => $username, + 'user_password' => md5($new_password), + 'user_email' => $email, + 'group_id' => (int) $group_id, + 'user_timezone' => (float) $tz, + 'user_lang' => $lang, + 'user_type' => $user_type, + 'user_actkey' => $user_actkey, + 'user_ip' => $user->ip, + 'user_regdate' => time(), + 'user_inactive_reason' => $user_inactive_reason, + 'user_inactive_time' => $user_inactive_time, ); // Register user... |