diff options
| author | Bart van Bragt <bartvb@users.sourceforge.net> | 2004-01-08 20:33:56 +0000 |
|---|---|---|
| committer | Bart van Bragt <bartvb@users.sourceforge.net> | 2004-01-08 20:33:56 +0000 |
| commit | d8c35f8b20463f7bfeb9f68b87d1886b52a290b4 (patch) | |
| tree | 4d1c380e15019d66446ba439129193c7e3f80eb1 | |
| parent | c97adb5a2e7e732d954fcada6eaf8f8766a0452b (diff) | |
| download | forums-d8c35f8b20463f7bfeb9f68b87d1886b52a290b4.tar forums-d8c35f8b20463f7bfeb9f68b87d1886b52a290b4.tar.gz forums-d8c35f8b20463f7bfeb9f68b87d1886b52a290b4.tar.bz2 forums-d8c35f8b20463f7bfeb9f68b87d1886b52a290b4.tar.xz forums-d8c35f8b20463f7bfeb9f68b87d1886b52a290b4.zip | |
Some minor fixes for the registration procedure
git-svn-id: file:///svn/phpbb/trunk@4732 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/adm/admin_board.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/adm/admin_board.php b/phpBB/adm/admin_board.php index f84a13d048..3d2f8a55e6 100644 --- a/phpBB/adm/admin_board.php +++ b/phpBB/adm/admin_board.php @@ -228,7 +228,7 @@ switch ($mode) eval('$' . str_replace('allow_', '', $switch) . '_no = (!$new[\'' . $switch . "']) ? 'checked=\"checked\"' : '';"); } - $user_char_ary = array('USERNAME_CHARS_ANY' => '.*', 'USERNAME_ALPHA_ONLY' => '[/w]+', 'USERNAME_ALPHA_SPACERS' => '[\w_\+\. \-\[\]]+'); + $user_char_ary = array('USERNAME_CHARS_ANY' => '.*', 'USERNAME_ALPHA_ONLY' => '[\w]+', 'USERNAME_ALPHA_SPACERS' => '[\w_\+\. \-\[\]]+'); $user_char_options = ''; foreach ($user_char_ary as $lang => $value) { diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 20e98b106f..d2087cd96a 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -239,7 +239,7 @@ class ucp_register extends module 'PASSWORD' => $password_confirm, 'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']), - 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&k=$user_actkey") + 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u=$user_id&k=$user_actkey") ); if ($coppa) @@ -276,7 +276,7 @@ class ucp_register extends module 'USERNAME' => $row['username'], 'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']), - 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&k=$user_actkey") + 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u=$user_id&k=$user_actkey") ); $messenger->send($row['user_notify_type']); |