makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-17 16:58:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13522] Remove unused variables and unexpected returns

Browse source 
PHPBB3-13522
This commit is contained in:
Marc Alexander 2015-01-24 13:40:42 +01:00
parent 9a03b3aab6
commit 874f3584e2
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
phpBB/phpbb/captcha/plugins/qa.php
View file

@ -125,7 +125,7 @@ class qa
*/ */
public function is_available() public function is_available()
{ {
global $config, $db, $phpbb_root_path, $phpEx, $user; global $config, $db, $user;
// load language file for pretty display in the ACP dropdown // load language file for pretty display in the ACP dropdown
$user->add_lang('captcha_qa'); $user->add_lang('captcha_qa');
@ -263,7 +263,7 @@ class qa
*/ */
function garbage_collect($type = 0) function garbage_collect($type = 0)
{ {
global $db, $config; global $db;
$sql = 'SELECT c.confirm_id $sql = 'SELECT c.confirm_id
FROM ' . $this->table_qa_confirm . ' c FROM ' . $this->table_qa_confirm . ' c
@ -310,8 +310,6 @@ class qa
$db_tool = new \phpbb\db\tools($db); $db_tool = new \phpbb\db\tools($db);
$tables = array($this->table_captcha_questions, $this->table_captcha_answers, $this->table_qa_confirm);
$schemas = array( $schemas = array(
$this->table_captcha_questions => array ( $this->table_captcha_questions => array (
'COLUMNS' => array( 'COLUMNS' => array(
@ -366,7 +364,7 @@ class qa
*/ */
function validate() function validate()
{ {
global $config, $db, $user; global $user;
$error = ''; $error = '';
@ -414,7 +412,7 @@ class qa
if (!sizeof($this->question_ids)) if (!sizeof($this->question_ids))
{ {
return false; return;
} }
$this->confirm_id = md5(unique_id($user->ip)); $this->confirm_id = md5(unique_id($user->ip));
$this->question = (int) array_rand($this->question_ids); $this->question = (int) array_rand($this->question_ids);
@ -440,7 +438,7 @@ class qa
if (!sizeof($this->question_ids)) if (!sizeof($this->question_ids))
{ {
return false; return;
} }
$this->question = (int) array_rand($this->question_ids); $this->question = (int) array_rand($this->question_ids);
@ -611,8 +609,8 @@ class qa
*/ */
function acp_page($id, &$module) function acp_page($id, &$module)
{ {
global $db, $user, $auth, $template; global $user, $template;
global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx; global $config;
$user->add_lang('acp/board'); $user->add_lang('acp/board');
$user->add_lang('captcha_qa'); $user->add_lang('captcha_qa');
@ -674,7 +672,6 @@ class qa
else else
{ {
// okay, show the editor // okay, show the editor
$error = false;
$input_question = request_var('question_text', '', true); $input_question = request_var('question_text', '', true);
$input_answers = request_var('answers', '', true); $input_answers = request_var('answers', '', true);
$input_lang = request_var('lang_iso', '', true); $input_lang = request_var('lang_iso', '', true);
@ -819,6 +816,8 @@ class qa
return $question; return $question;
} }
return false;
} }
/** /**