mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

$template to phpbb::$template

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@9337 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2009-02-22 18:56:09 +00:00
parent 84f795e9fb
commit b27add94f8
76 changed files with 1215 additions and 1244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/includes/captcha/plugins/captcha_abstract.php
View File

@@ -72,30 +72,30 @@ abstract class phpbb_default_captcha implements phpbb_captcha_plugin
function get_template()
{
$template->set_filenames(array(
'captcha' => 'captcha_default.html')
);
phpbb::$template->set_filenames(array(
'captcha' => 'captcha_default.html',
));
$template->assign_vars(array(
phpbb::$template->assign_vars(array(
'CONFIRM_IMAGE' => append_sid('ucp', 'mode=confirm&confirm_id=' . $this->confirm_id . '&type=' . $this->type),
'CONFIRM_ID' => $this->confirm_id,
));
return $template->assign_display('captcha');
return phpbb::$template->assign_display('captcha');
}
function get_demo_template($id)
{
$template->set_filenames(array(
'captcha_demo' => 'captcha_default_acp_demo.html')
);
phpbb::$template->set_filenames(array(
'captcha_demo' => 'captcha_default_acp_demo.html',
));
// acp_captcha has a delivery function; let's use it
$template->assign_vars(array(
phpbb::$template->assign_vars(array(
'CONFIRM_IMAGE' => append_sid(PHPBB_ADMIN_PATH . 'index.' . PHP_EXT, 'captcha_demo=1&mode=visual&i=' . $id . '&select_captcha=' . $this->get_class_name()),
'CONFIRM_ID' => $this->confirm_id,
));
return $template->assign_display('captcha_demo');
return phpbb::$template->assign_display('captcha_demo');
}
function get_hidden_fields()

5
phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
View File

@@ -86,9 +86,10 @@ class phpbb_captcha_gd extends phpbb_default_captcha implements phpbb_captcha_pl
foreach ($captcha_vars as $captcha_var => $template_var)
{
$var = request_var($captcha_var, (int) phpbb::$config[$captcha_var]);
$template->assign_var($template_var, $var);
phpbb::$template->assign_var($template_var, $var);
}
$template->assign_vars(array(
phpbb::$template->assign_vars(array(
'CAPTCHA_PREVIEW' => $this->get_demo_template($id),
'CAPTCHA_NAME' => $this->get_class_name(),
));

15
phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
View File

@@ -92,9 +92,10 @@ class phpbb_recaptcha extends phpbb_default_captcha implements phpbb_captcha_plu
foreach ($captcha_vars as $captcha_var => $template_var)
{
$var = request_var($captcha_var, (isset(phpbb::$config[$captcha_var])) ? (string) phpbb::$config[$captcha_var] : '');
$template->assign_var($template_var, $var);
phpbb::$template->assign_var($template_var, $var);
}
$template->assign_vars(array(
phpbb::$template->assign_vars(array(
'CAPTCHA_PREVIEW' => $this->get_demo_template($id),
'CAPTCHA_NAME' => $this->get_class_name(),
));
@@ -117,18 +118,18 @@ class phpbb_recaptcha extends phpbb_default_captcha implements phpbb_captcha_plu
function get_template()
{
$template->set_filenames(array(
'captcha' => 'captcha_recaptcha.html')
);
phpbb::$template->set_filenames(array(
'captcha' => 'captcha_recaptcha.html',
));
$template->assign_vars(array(
phpbb::$template->assign_vars(array(
'RECAPTCHA_SERVER' => self::recaptcha_server,
'RECAPTCHA_PUBKEY' => isset(phpbb::$config['recaptcha_pubkey']) ? phpbb::$config['recaptcha_pubkey'] : '',
'RECAPTCHA_ERRORGET' => '',
'S_RECAPTCHA_AVAILABLE' => self::is_available(),
));
return $template->assign_display('captcha');
return phpbb::$template->assign_display('captcha');
}
function get_demo_template($id)