diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-02-22 15:29:18 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-02-22 15:29:18 +0000 |
| commit | 794c5749696c9fa2595ed3a1d7c836a0d984e11c (patch) | |
| tree | 37aab2f0f965ddcaeb1d26af753095f59a6e025c /phpBB/modules/acp/acp_captcha.php | |
| parent | 7aced345c5a2871f6eddfe316297b4ff9a0ebb76 (diff) | |
| download | forums-794c5749696c9fa2595ed3a1d7c836a0d984e11c.tar forums-794c5749696c9fa2595ed3a1d7c836a0d984e11c.tar.gz forums-794c5749696c9fa2595ed3a1d7c836a0d984e11c.tar.bz2 forums-794c5749696c9fa2595ed3a1d7c836a0d984e11c.tar.xz forums-794c5749696c9fa2595ed3a1d7c836a0d984e11c.zip | |
remove global and change $user-> to phpbb::$user->
git-svn-id: file:///svn/phpbb/trunk@9334 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/modules/acp/acp_captcha.php')
| -rw-r--r-- | phpBB/modules/acp/acp_captcha.php | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/phpBB/modules/acp/acp_captcha.php b/phpBB/modules/acp/acp_captcha.php index 2eedf4da7c..df265ee877 100644 --- a/phpBB/modules/acp/acp_captcha.php +++ b/phpBB/modules/acp/acp_captcha.php @@ -26,9 +26,7 @@ class acp_captcha function main($id, $mode) { - global $db, $user, $auth, $template; - - $user->add_lang('acp/board'); + phpbb::$user->add_lang('acp/board'); include(PHPBB_ROOT_PATH . 'includes/captcha/captcha_factory.' . PHP_EXT); @@ -83,14 +81,14 @@ class acp_captcha } else { - trigger_error($user->lang['CAPTCHA_UNAVAILABLE'] . adm_back_link($this->u_action)); + trigger_error(phpbb::$user->lang['CAPTCHA_UNAVAILABLE'] . adm_back_link($this->u_action)); } } - trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action)); + trigger_error(phpbb::$user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action)); } else if ($submit) { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link()); + trigger_error(phpbb::$user->lang['FORM_INVALID'] . adm_back_link()); } else { @@ -98,18 +96,18 @@ class acp_captcha foreach ($captchas['available'] as $value => $title) { $current = ($selected !== false && $value == $selected) ? ' selected="selected"' : ''; - $captcha_select .= '<option value="' . $value . '"' . $current . '>' . $user->lang[$title] . '</option>'; + $captcha_select .= '<option value="' . $value . '"' . $current . '>' . phpbb::$user->lang[$title] . '</option>'; } foreach ($captchas['unavailable'] as $value => $title) { - $captcha_select .= '<option value="' . $value . '"' . $current . ' class="disabled-option" >' . $user->lang[$title] . '</option>'; + $captcha_select .= '<option value="' . $value . '"' . $current . ' class="disabled-option" >' . phpbb::$user->lang[$title] . '</option>'; } $demo_captcha = phpbb_captcha_factory::get_instance($selected); foreach ($config_vars as $config_var => $template_var) { - $template->assign_var($template_var, request_var($config_var, $config[$config_var])) ; + $template->assign_var($template_var, request_var($config_var, phpbb::$config[$config_var])) ; } $template->assign_vars(array( @@ -127,8 +125,6 @@ class acp_captcha */ function deliver_demo($selected) { - global $db, $user; - $captcha = phpbb_captcha_factory::get_instance($selected); $captcha->init(CONFIRM_REG); $captcha->execute_demo(); |