diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2004-10-13 19:30:02 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2004-10-13 19:30:02 +0000 |
| commit | c941f666cf5184b508589fc151772f42f1a2d4c5 (patch) | |
| tree | 88d74b4c9ac57e16682b93878885d6f809fe55a5 /phpBB/includes/ucp/ucp_remind.php | |
| parent | 4804c05bca3e49a62a3fb91a988364024e745a5c (diff) | |
| download | forums-c941f666cf5184b508589fc151772f42f1a2d4c5.tar forums-c941f666cf5184b508589fc151772f42f1a2d4c5.tar.gz forums-c941f666cf5184b508589fc151772f42f1a2d4c5.tar.bz2 forums-c941f666cf5184b508589fc151772f42f1a2d4c5.tar.xz forums-c941f666cf5184b508589fc151772f42f1a2d4c5.zip | |
- ucp register/remind/activate fixes mostly regarding account activation
- general ucp fixing (profile and ucp_main)
- created three new functions (return correct topic author string, generate topic related pagination and get topic type/status...). These general bits are used on several pages (subscribed topics, bookmarks, viewforum).
- config basic schema fix
- commented out inline fix for unread topic tracking in viewforum, instead tried another method (hopefully working as well)
git-svn-id: file:///svn/phpbb/trunk@5001 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_remind.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_remind.php | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php index f119633c82..ae6ce3c27c 100644 --- a/phpBB/includes/ucp/ucp_remind.php +++ b/phpBB/includes/ucp/ucp_remind.php @@ -28,20 +28,17 @@ class ucp_remind extends module FROM ' . USERS_TABLE . " WHERE user_email = '" . $db->sql_escape($email) . "' AND username = '" . $db->sql_escape($username) . "'"; - if (!($result = $db->sql_query($sql))) - { - trigger_error($user->lang['NO_USER']); - } + $result = $db->sql_query($sql); if (!($row = $db->sql_fetchrow($result))) { - trigger_error($lang['NO_EMAIL']); + trigger_error('NO_EMAIL_USER'); } $db->sql_freeresult($result); if ($row['user_type'] == USER_INACTIVE) { - trigger_error($lang['ACCOUNT_INACTIVE']); + trigger_error('ACCOUNT_NOT_ACTIVATED'); } $server_url = generate_board_url(); @@ -49,7 +46,7 @@ class ucp_remind extends module $user_id = $row['user_id']; $key_len = 54 - strlen($server_url); - $key_len = ($str_len > 6) ? $key_len : 6; + $key_len = ($key_len > 6) ? $key_len : 6; $user_actkey = substr(gen_rand_string(10), 0, $key_len); $user_password = gen_rand_string(8); @@ -63,7 +60,6 @@ class ucp_remind extends module $messenger = new messenger(); $messenger->template('user_activate_passwd', $row['user_lang']); - $messenger->subject($subject); $messenger->replyto($user->data['user_email']); $messenger->to($row['user_email'], $row['username']); |