mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-10 13:28:55 +00:00
git-svn-id: file:///svn/phpbb/trunk@6448 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
0f0d160ded
commit
7777bd5f50
1 changed files with 24 additions and 15 deletions
|
@ -523,6 +523,8 @@ if ($load && $post_data['drafts'])
|
||||||
load_drafts($topic_id, $forum_id);
|
load_drafts($topic_id, $forum_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$solved_captcha = false;
|
||||||
|
|
||||||
if ($submit || $preview || $refresh)
|
if ($submit || $preview || $refresh)
|
||||||
{
|
{
|
||||||
$post_data['topic_cur_post_id'] = request_var('topic_cur_post_id', 0);
|
$post_data['topic_cur_post_id'] = request_var('topic_cur_post_id', 0);
|
||||||
|
@ -718,6 +720,10 @@ if ($submit || $preview || $refresh)
|
||||||
{
|
{
|
||||||
$error[] = $user->lang['CONFIRM_CODE_WRONG'];
|
$error[] = $user->lang['CONFIRM_CODE_WRONG'];
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$solved_captcha = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse subject
|
// Parse subject
|
||||||
|
@ -1125,23 +1131,26 @@ if ($config['enable_post_confirm'] && !$user->data['is_registered'] && ($mode ==
|
||||||
$db->sql_query($sql);
|
$db->sql_query($sql);
|
||||||
|
|
||||||
// Generate code
|
// Generate code
|
||||||
$code = gen_rand_string(mt_rand(5, 8));
|
if ($solved_captcha === false)
|
||||||
$confirm_id = md5(unique_id($user->ip));
|
{
|
||||||
|
$code = gen_rand_string(mt_rand(5, 8));
|
||||||
|
$confirm_id = md5(unique_id($user->ip));
|
||||||
|
|
||||||
$sql = 'INSERT INTO ' . CONFIRM_TABLE . ' ' . $db->sql_build_array('INSERT', array(
|
$sql = 'INSERT INTO ' . CONFIRM_TABLE . ' ' . $db->sql_build_array('INSERT', array(
|
||||||
'confirm_id' => (string) $confirm_id,
|
'confirm_id' => (string) $confirm_id,
|
||||||
'session_id' => (string) $user->session_id,
|
'session_id' => (string) $user->session_id,
|
||||||
'confirm_type' => (int) CONFIRM_POST,
|
'confirm_type' => (int) CONFIRM_POST,
|
||||||
'code' => (string) $code)
|
'code' => (string) $code)
|
||||||
);
|
);
|
||||||
$db->sql_query($sql);
|
$db->sql_query($sql);
|
||||||
|
|
||||||
$template->assign_vars(array(
|
$template->assign_vars(array(
|
||||||
'S_CONFIRM_CODE' => true,
|
'S_CONFIRM_CODE' => true,
|
||||||
'CONFIRM_ID' => $confirm_id,
|
'CONFIRM_ID' => $confirm_id,
|
||||||
'CONFIRM_IMAGE' => '<img src="' . append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=confirm&id=' . $confirm_id . '&type=' . CONFIRM_POST) . '" alt="" title="" />',
|
'CONFIRM_IMAGE' => '<img src="' . append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=confirm&id=' . $confirm_id . '&type=' . CONFIRM_POST) . '" alt="" title="" />',
|
||||||
'L_POST_CONFIRM_EXPLAIN' => sprintf($user->lang['POST_CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlentities($config['board_contact']) . '">', '</a>'),
|
'L_POST_CONFIRM_EXPLAIN' => sprintf($user->lang['POST_CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlentities($config['board_contact']) . '">', '</a>'),
|
||||||
));
|
));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$s_hidden_fields = ($mode == 'reply' || $mode == 'quote') ? '<input type="hidden" name="topic_cur_post_id" value="' . $post_data['topic_last_post_id'] . '" />' : '';
|
$s_hidden_fields = ($mode == 'reply' || $mode == 'quote') ? '<input type="hidden" name="topic_cur_post_id" value="' . $post_data['topic_last_post_id'] . '" />' : '';
|
||||||
|
|
Loading…
Add table
Reference in a new issue