makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixing back links

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9801 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2009-07-20 10:22:13 +00:00
parent b3767cd143
commit ff60fc9c1e
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
View file

@ -474,6 +474,7 @@ class phpbb_captcha_qa
$question_id = request_var('question_id', 0); $question_id = request_var('question_id', 0);
$action = request_var('action', ''); $action = request_var('action', '');
$list_url = $module->u_action . "&configure=1&select_captcha=" . $this->get_class_name();
$template->assign_vars(array( $template->assign_vars(array(
'U_ACTION' => $module->u_action, 'U_ACTION' => $module->u_action,
@ -490,7 +491,7 @@ class phpbb_captcha_qa
if (confirm_box(true)) if (confirm_box(true))
{ {
$this->acp_delete_question($question_id); $this->acp_delete_question($question_id);
trigger_error($user->lang['QUESTION_DELETED'] . adm_back_link($module->u_action)); trigger_error($user->lang['QUESTION_DELETED'] . adm_back_link($list_url));
} }
else else
{ {
@ -520,6 +521,9 @@ class phpbb_captcha_qa
)); ));
} }
$template->assign_vars(array(
'U_LIST' => $list_url,
));
if ($question_id) if ($question_id)
{ {
if ($question = $this->acp_get_question_data($question_id)) if ($question = $this->acp_get_question_data($question_id))
@ -534,7 +538,7 @@ class phpbb_captcha_qa
} }
else else
{ {
trigger_error($user->lang['FORM_INVALID'] . adm_back_link($module->u_action)); trigger_error($user->lang['FORM_INVALID'] . adm_back_link($list_url));
} }
} }
else else
@ -568,12 +572,12 @@ class phpbb_captcha_qa
$this->acp_add_question($data); $this->acp_add_question($data);
} }
trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($module->u_action . "&configure=1&select_captcha=" . $this->get_class_name())); trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($list_url));
} }
} }
else if ($submit) else if ($submit)
{ {
trigger_error($user->lang['FORM_INVALID'] . adm_back_link($module->u_action)); trigger_error($user->lang['FORM_INVALID'] . adm_back_link($list_url));
} }
} }
} }

4
phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
View file

@ -36,7 +36,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
{ {
global $config, $db, $user; global $config, $db, $user;
$user->add_lang('recaptcha'); $user->add_lang('captcha_recaptcha');
parent::init($type); parent::init($type);
$this->challenge = request_var('recaptcha_challenge_field', ''); $this->challenge = request_var('recaptcha_challenge_field', '');
$this->response = request_var('recaptcha_response_field', ''); $this->response = request_var('recaptcha_response_field', '');
@ -51,7 +51,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
function is_available() function is_available()
{ {
global $config, $user; global $config, $user;
$user->add_lang('recaptcha'); $user->add_lang('captcha_recaptcha');
return (isset($config['recaptcha_pubkey']) && !empty($config['recaptcha_pubkey'])); return (isset($config['recaptcha_pubkey']) && !empty($config['recaptcha_pubkey']));
} }

0
phpBB/language/en/recaptcha.php → phpBB/language/en/captcha_recaptcha.php
View file