diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2009-07-20 18:27:26 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2009-07-20 18:27:26 +0000 |
| commit | 783da3064a2a4e7163230b75cacb6ef7073493dc (patch) | |
| tree | 07b78e21570c9c3a4183bc00aea9d3de19093bb0 | |
| parent | 2dbf5fd1a2ac3db106abfb768fe629f66cb328d9 (diff) | |
| download | forums-783da3064a2a4e7163230b75cacb6ef7073493dc.tar forums-783da3064a2a4e7163230b75cacb6ef7073493dc.tar.gz forums-783da3064a2a4e7163230b75cacb6ef7073493dc.tar.bz2 forums-783da3064a2a4e7163230b75cacb6ef7073493dc.tar.xz forums-783da3064a2a4e7163230b75cacb6ef7073493dc.zip | |
rename variables to avoid name clashes in aggregating plugins
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9808 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php | 18 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/captcha_qa.html | 6 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/captcha_qa.html | 6 |
3 files changed, 16 insertions, 14 deletions
diff --git a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php index fdbbf1d218..cd5ee8c91d 100644 --- a/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php +++ b/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php @@ -50,10 +50,11 @@ class phpbb_captcha_qa { global $config, $db, $user; + // load our language file $user->add_lang('captcha_qa'); // read input - $this->confirm_id = request_var('confirm_id', ''); - $this->answer = request_var('answer', ''); + $this->confirm_id = request_var('qa_confirm_id', ''); + $this->answer = request_var('qa_answer', ''); $this->type = (int) $type; $this->question_lang = $user->data['user_lang']; @@ -118,6 +119,7 @@ class phpbb_captcha_qa { global $config, $db, $phpbb_root_path, $phpEx, $user; + // load language file for pretty display in the ACP dropdown $user->add_lang('captcha_qa'); if (!self::is_installed()) @@ -170,8 +172,8 @@ class phpbb_captcha_qa global $template; $template->assign_vars(array( - 'CONFIRM_QUESTION' => $this->question_text, - 'CONFIRM_ID' => $this->confirm_id, + 'QA_CONFIRM_QUESTION' => $this->question_text, + 'QA_CONFIRM_ID' => $this->confirm_id, 'S_CONFIRM_CODE' => true, 'S_TYPE' => $this->type, )); @@ -197,9 +199,9 @@ class phpbb_captcha_qa // this is required - otherwise we would forget about the captcha being already solved if ($this->solved) { - $hidden_fields['answer'] = $this->answer; + $hidden_fields['qa_answer'] = $this->answer; } - $hidden_fields['confirm_id'] = $this->confirm_id; + $hidden_fields['qa_confirm_id'] = $this->confirm_id; return $hidden_fields; } @@ -447,7 +449,7 @@ class phpbb_captcha_qa { global $db; - $answer = ($this->question_strict) ? request_var('answer', '') : utf8_clean_string(request_var('answer', '')); + $answer = ($this->question_strict) ? request_var('qa_answer', '') : utf8_clean_string(request_var('qa_answer', '')); $sql = 'SELECT answer_text FROM ' . ANSWERS_TABLE . ' @@ -509,7 +511,7 @@ class phpbb_captcha_qa */ function is_solved() { - if (request_var('answer', false) && $this->solved === 0) + if (request_var('qa_answer', false) && $this->solved === 0) { $this->validate(); } diff --git a/phpBB/styles/prosilver/template/captcha_qa.html b/phpBB/styles/prosilver/template/captcha_qa.html index e363ee008d..375ae401a4 100644 --- a/phpBB/styles/prosilver/template/captcha_qa.html +++ b/phpBB/styles/prosilver/template/captcha_qa.html @@ -7,10 +7,10 @@ <!-- ENDIF --> <dl> - <dt><label>{CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt> + <dt><label>{QA_CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt> <dd> - <input type="text" tabindex="10" name="answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" /> - <input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /> + <input type="text" tabindex="10" name="qa_answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" /> + <input type="hidden" name="confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" /> </dd> </dl> diff --git a/phpBB/styles/subsilver2/template/captcha_qa.html b/phpBB/styles/subsilver2/template/captcha_qa.html index 08b267b8fb..1711bdb90d 100644 --- a/phpBB/styles/subsilver2/template/captcha_qa.html +++ b/phpBB/styles/subsilver2/template/captcha_qa.html @@ -1,5 +1,5 @@ <tr> - <td class="row1"><b class="genmed">{CONFIRM_QUESTION}: </b><br /></td> - <td class="row2"><input class="post" type="text" name="answer" size="80" /></td> - <input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></td> + <td class="row1"><b class="genmed">{QA_CONFIRM_QUESTION}: </b><br /></td> + <td class="row2"><input class="post" type="text" name="qa_answer" size="80" /></td> + <input type="hidden" name="qa_confirm_id" id="confirm_id" value="{QA_CONFIRM_ID}" /></td> </tr>
\ No newline at end of file |