Menu
▾
▴
[Phpbb-checkins] r9801 - in /branches/phpBB-3_0_0/phpBB: includes/captcha/plugins/phpbb_captcha_qa_plugin.php includes/captcha/plugins/phpbb_recaptcha_plugin.php language/en/captcha_recaptcha.php language/en/recaptcha.php
Author: Kellanved
Date: Mon Jul 20 10:22:13 2009
New Revision: 9801
Log:
fixing back links
Added:
branches/phpBB-3_0_0/phpBB/language/en/captcha_recaptcha.php
- copied unchanged from r9800, branches/phpBB-3_0_0/phpBB/language/en/recaptcha.php
Removed:
branches/phpBB-3_0_0/phpBB/language/en/recaptcha.php
Modified:
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php Mon Jul 20 10:22:13 2009
***************
*** 474,479 ****
--- 474,480 ----
$question_id = request_var('question_id', 0);
$action = request_var('action', '');
+ $list_url = $module->u_action . "&configure=1&select_captcha=" . $this->get_class_name();
$template->assign_vars(array(
'U_ACTION' => $module->u_action,
***************
*** 490,496 ****
if (confirm_box(true))
{
$this->acp_delete_question($question_id);
! trigger_error($user->lang['QUESTION_DELETED'] . adm_back_link($module->u_action));
}
else
{
--- 491,497 ----
if (confirm_box(true))
{
$this->acp_delete_question($question_id);
! trigger_error($user->lang['QUESTION_DELETED'] . adm_back_link($list_url));
}
else
{
***************
*** 520,525 ****
--- 521,529 ----
));
}
+ $template->assign_vars(array(
+ 'U_LIST' => $list_url,
+ ));
if ($question_id)
{
if ($question = $this->acp_get_question_data($question_id))
***************
*** 534,540 ****
}
else
{
! trigger_error($user->lang['FORM_INVALID'] . adm_back_link($module->u_action));
}
}
else
--- 538,544 ----
}
else
{
! trigger_error($user->lang['FORM_INVALID'] . adm_back_link($list_url));
}
}
else
***************
*** 568,579 ****
$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()));
}
}
else if ($submit)
{
! trigger_error($user->lang['FORM_INVALID'] . adm_back_link($module->u_action));
}
}
}
--- 572,583 ----
$this->acp_add_question($data);
}
! trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($list_url));
}
}
else if ($submit)
{
! trigger_error($user->lang['FORM_INVALID'] . adm_back_link($list_url));
}
}
}
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php Mon Jul 20 10:22:13 2009
***************
*** 36,42 ****
{
global $config, $db, $user;
! $user->add_lang('recaptcha');
parent::init($type);
$this->challenge = request_var('recaptcha_challenge_field', '');
$this->response = request_var('recaptcha_response_field', '');
--- 36,42 ----
{
global $config, $db, $user;
! $user->add_lang('captcha_recaptcha');
parent::init($type);
$this->challenge = request_var('recaptcha_challenge_field', '');
$this->response = request_var('recaptcha_response_field', '');
***************
*** 51,57 ****
function is_available()
{
global $config, $user;
! $user->add_lang('recaptcha');
return (isset($config['recaptcha_pubkey']) && !empty($config['recaptcha_pubkey']));
}
--- 51,57 ----
function is_available()
{
global $config, $user;
! $user->add_lang('captcha_recaptcha');
return (isset($config['recaptcha_pubkey']) && !empty($config['recaptcha_pubkey']));
}
Removed: branches/phpBB-3_0_0/phpBB/language/en/recaptcha.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/recaptcha.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/recaptcha.php (removed)
***************
*** 1,52 ****
- <?php
- /**
- *
- * recaptcha [English]
- *
- * @package language
- * @version $Id$
- * @copyright (c) 2009 phpBB Group
- * @license http://opensource.org/licenses/gpl-license.php GNU Public License
- *
- */
-
- /**
- * DO NOT CHANGE
- */
- if (!defined('IN_PHPBB'))
- {
- exit;
- }
-
- if (empty($lang) || !is_array($lang))
- {
- $lang = array();
- }
-
- // DEVELOPERS PLEASE NOTE
- //
- // All language files should use UTF-8 as their encoding and the files must not contain a BOM.
- //
- // Placeholders can now contain order information, e.g. instead of
- // 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
- // translators to re-order the output of data while ensuring it remains correct
- //
- // You do not need this where single placeholders are used, e.g. 'Message %d' is fine
- // equally where a string contains only two placeholders which are used to wrap text
- // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
- $lang = array_merge($lang, array(
- 'RECAPTCHA_LANG' => 'en',
- 'RECAPTCHA_NOT_AVAILABLE' => 'You have to register for reCaptcha at <a href="http://recaptcha.net">reCaptcha.net</a>.',
- 'CAPTCHA_RECAPTCHA' => 'reCaptcha',
- 'RECAPTCHA_INCORRECT' => 'The entered visual confirmation was incorrect',
-
- 'RECAPTCHA_PUBLIC' => 'Public reCaptcha key',
- 'RECAPTCHA_PUBLIC_EXPLAIN' => 'Your public reCaptcha key. You can obtain keys from <a href="http://recaptcha.net">reCaptcha.net</a>.',
- 'RECAPTCHA_PRIVATE' => 'Private reCaptcha key',
- 'RECAPTCHA_PRIVATE_EXPLAIN' => 'Your private reCaptcha key. You can obtain keys from <a href="http://recaptcha.net">reCaptcha.net</a>.',
-
- 'RECAPTCHA_EXPLAIN' => 'To avoid spam postings, please enter the two words shown in the picture into the text field underneath.',
- ));
-
- ?>
\ No newline at end of file
--- 0 ----
|
