diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-01-23 23:02:10 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-01-23 23:02:10 +0000 |
| commit | 1613c37d91ab6bf7d6812b889c79f423bf52fda1 (patch) | |
| tree | 019d07a37419078341c296f55af67b43750e9837 /phpBB/includes/ucp | |
| parent | 055aef50030304a2a3a50e5a91bdb29a8b76ac64 (diff) | |
| download | forums-1613c37d91ab6bf7d6812b889c79f423bf52fda1.tar forums-1613c37d91ab6bf7d6812b889c79f423bf52fda1.tar.gz forums-1613c37d91ab6bf7d6812b889c79f423bf52fda1.tar.bz2 forums-1613c37d91ab6bf7d6812b889c79f423bf52fda1.tar.xz forums-1613c37d91ab6bf7d6812b889c79f423bf52fda1.zip | |
- change registration page language on-the-fly
- added download function to functions_compress as well as tiny bugfixes
- added local_name and author to iso.txt file
git-svn-id: file:///svn/phpbb/trunk@5074 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 110 |
1 files changed, 72 insertions, 38 deletions
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index be29709ca7..91f0722317 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -30,6 +30,17 @@ class ucp_register extends module $coppa = (isset($_REQUEST['coppa'])) ? ((!empty($_REQUEST['coppa'])) ? 1 : 0) : false; $agreed = (!empty($_POST['agreed'])) ? 1 : 0; $submit = (isset($_POST['submit'])) ? true : false; + $change_lang = request_var('change_lang', ''); + + if ($change_lang) + { + $submit = false; + $lang = $change_lang; + $user->lang_name = $lang = $change_lang; + $user->lang_path = $phpbb_root_path . 'language/' . $lang . '/'; + $user->lang = array(); + $user->add_lang(array('common', 'ucp')); + } $cp = new custom_profile(); @@ -68,6 +79,27 @@ class ucp_register extends module $this->display($user->lang['REGISTER'], 'ucp_agreement.html'); } + // If we change the language inline, we do not want to display errors, but pre-fill already filled out values + if ($change_lang) + { + $var_ary = array( + 'username' => (string) '', + 'password_confirm' => (string) '', + 'new_password' => (string) '', + 'cur_password' => (string) '', + 'email' => (string) '', + 'email_confirm' => (string) '', + 'confirm_code' => (string) '', + 'lang' => (string) $config['default_lang'], + 'tz' => (float) $config['board_timezone'], + ); + + foreach ($var_ary as $var => $default) + { + $$var = request_var($var, $default); + } + } + // Check and initialize some variables if needed if ($submit) { @@ -272,7 +304,7 @@ class ucp_register extends module { include_once($phpbb_root_path . 'includes/functions_messenger.'.$phpEx); - $messenger = new messenger(); + $messenger = new messenger(false); $messenger->template($email_template, $lang); @@ -335,8 +367,6 @@ class ucp_register extends module } $db->sql_freeresult($result); } - - $messenger->queue->save(); } if ($config['require_activation'] == USER_ACTIVATION_NONE || !$config['email_enable']) @@ -353,53 +383,57 @@ class ucp_register extends module } $s_hidden_fields = '<input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" />'; + $s_hidden_fields .= '<input type="hidden" name="change_lang" value="0" />'; $confirm_image = ''; // Visual Confirmation - Show images if ($config['enable_confirm']) { - $sql = 'SELECT session_id - FROM ' . SESSIONS_TABLE; - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) + if (!$change_lang) { - $sql_in = array(); - do + $sql = 'SELECT session_id + FROM ' . SESSIONS_TABLE; + $result = $db->sql_query($sql); + + if ($row = $db->sql_fetchrow($result)) { - $sql_in[] = "'" . $db->sql_escape($row['session_id']) . "'"; - } - while ($row = $db->sql_fetchrow($result)); + $sql_in = array(); + do + { + $sql_in[] = "'" . $db->sql_escape($row['session_id']) . "'"; + } + while ($row = $db->sql_fetchrow($result)); - $sql = 'DELETE FROM ' . CONFIRM_TABLE . ' - WHERE session_id NOT IN (' . implode(', ', $sql_in) . ')'; - $db->sql_query($sql); - } - $db->sql_freeresult($result); + $sql = 'DELETE FROM ' . CONFIRM_TABLE . ' + WHERE session_id NOT IN (' . implode(', ', $sql_in) . ')'; + $db->sql_query($sql); + } + $db->sql_freeresult($result); - $sql = 'SELECT COUNT(session_id) AS attempts - FROM ' . CONFIRM_TABLE . " - WHERE session_id = '" . $db->sql_escape($user->session_id) . "'"; - $result = $db->sql_query($sql); + $sql = 'SELECT COUNT(session_id) AS attempts + FROM ' . CONFIRM_TABLE . " + WHERE session_id = '" . $db->sql_escape($user->session_id) . "'"; + $result = $db->sql_query($sql); - if ($row = $db->sql_fetchrow($result)) - { - if ($config['max_reg_attempts'] && $row['attempts'] >= $config['max_reg_attempts']) + if ($row = $db->sql_fetchrow($result)) { - trigger_error($user->lang['TOO_MANY_REGISTERS']); + if ($config['max_reg_attempts'] && $row['attempts'] >= $config['max_reg_attempts']) + { + trigger_error($user->lang['TOO_MANY_REGISTERS']); + } } + $db->sql_freeresult($result); + + $code = gen_rand_string(6); + $confirm_id = md5(uniqid($user_ip)); + + $sql = 'INSERT INTO ' . CONFIRM_TABLE . ' ' . $db->sql_build_array('INSERT', array( + 'confirm_id' => (string) $confirm_id, + 'session_id' => (string) $user->session_id, + 'code' => (string) $code) + ); + $db->sql_query($sql); } - $db->sql_freeresult($result); - - $code = gen_rand_string(6); - $confirm_id = md5(uniqid($user_ip)); - - $sql = 'INSERT INTO ' . CONFIRM_TABLE . ' ' . $db->sql_build_array('INSERT', array( - 'confirm_id' => (string) $confirm_id, - 'session_id' => (string) $user->session_id, - 'code' => (string) $code) - ); - $db->sql_query($sql); $confirm_image = (@extension_loaded('zlib')) ? "<img src=\"ucp.$phpEx$SID&mode=confirm&id=$confirm_id\" alt=\"\" title=\"\" />" : "<img src=\"ucp.$phpEx$SID&mode=confirm&id=$confirm_id&c=1\" alt=\"\" title=\"\" /><img src=\"ucp.$phpEx$SID&mode=confirm&id=$confirm_id&c=2\" alt=\"\" title=\"\" /><img src=\"ucp.$phpEx$SID&mode=confirm&id=$confirm_id&c=3\" alt=\"\" title=\"\" /><img src=\"ucp.$phpEx$SID&mode=confirm&id=$confirm_id&c=4\" alt=\"\" title=\"\" /><img src=\"ucp.$phpEx$SID&mode=confirm&id=$confirm_id&c=5\" alt=\"\" title=\"\" /><img src=\"ucp.$phpEx$SID&mode=confirm&id=$confirm_id&c=6\" alt=\"\" title=\"\" />"; $s_hidden_fields .= '<input type="hidden" name="confirm_id" value="' . $confirm_id . '" />'; @@ -443,7 +477,7 @@ class ucp_register extends module 'S_CONFIRM_CODE' => ($config['enable_confirm']) ? true : false, 'S_COPPA' => $coppa, 'S_HIDDEN_FIELDS' => $s_hidden_fields, - 'S_UCP_ACTION' => "ucp.$phpEx$SID&mode=register") + 'S_UCP_ACTION' => "{$phpbb_root_path}ucp.$phpEx$SID&mode=register") ); // |