makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-14 23:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use dynamic includes, fix some style bugs, make the old default captcha family backwards compatible to 3.0.5 styles

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9609 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2009-06-17 13:29:26 +00:00
parent 2a079ecb52
commit c6c6841cfb
17 changed files with 47 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/adm/style/acp_captcha.html
View file

@ -41,10 +41,10 @@
</dl> </dl>
</fieldset> </fieldset>
<!-- IF CAPTCHA_PREVIEW --> <!-- IF CAPTCHA_PREVIEW_TPL -->
<fieldset> <fieldset>
<legend>{L_PREVIEW}</legend> <legend>{L_PREVIEW}</legend>
{CAPTCHA_PREVIEW} <!-- INCLUDE {CAPTCHA_PREVIEW_TPL} -->
</fieldset> </fieldset>
<!-- ENDIF --> <!-- ENDIF -->

5
phpBB/includes/captcha/captcha_gd.php
View file

@ -35,8 +35,7 @@ class captcha
{ {
global $config; global $config;
srand($seed); mt_srand($seed);
//mt_srand($seed);
// Create image // Create image
$img = imagecreatetruecolor($this->width, $this->height); $img = imagecreatetruecolor($this->width, $this->height);
@ -109,7 +108,7 @@ class captcha
if ($config['captcha_gd_3d_noise']) if ($config['captcha_gd_3d_noise'])
{ {
$xoffset = rand(0,9); $xoffset = mt_rand(0,9);
$noise_bitmaps = $this->captcha_noise_bg_bitmaps(); $noise_bitmaps = $this->captcha_noise_bg_bitmaps();
for ($i = 0; $i < $code_len; ++$i) for ($i = 0; $i < $code_len; ++$i)
{ {

22
phpBB/includes/captcha/plugins/captcha_abstract.php
View file

@ -86,28 +86,26 @@ class phpbb_default_captcha
{ {
global $config, $user, $template, $phpEx, $phpbb_root_path; global $config, $user, $template, $phpEx, $phpbb_root_path;
$template->set_filenames(array( $link = append_sid($phpbb_root_path . 'ucp.' . $phpEx . '?mode=confirm&amp;confirm_id=' . $this->confirm_id . '&amp;type=' . $this->type);
'captcha' => 'captcha_default.html') $explain = ($this->type != CONFIRM_POST) ? sprintf($user->lang['CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>') : $user->lang['POST_CONFIRM_EXPLAIN'];
);
$template->assign_vars(array( $template->assign_vars(array(
'CONFIRM_IMAGE' => append_sid($phpbb_root_path . 'ucp.' . $phpEx . '?mode=confirm&amp;confirm_id=' . $this->confirm_id . '&amp;type=' . $this->type), 'CONFIRM_IMAGE_LINK' => $link,
'CONFIRM_IMAGE' => '<img src="'. $link . '" />',
'CONFIRM_IMG' => '<img src="'. $link . '" />',
'CONFIRM_ID' => $this->confirm_id, 'CONFIRM_ID' => $this->confirm_id,
'S_REFRESH' => (bool) $config['confirm_refresh'], 'S_CONFIRM_CODE' => true,
'S_CONFIRM_REFRESH' => ($config['enable_confirm'] && $config['confirm_refresh'] && $this->type == CONFIRM_REG) ? true : false,
'L_CONFIRM_EXPLAIN' => $explain,
)); ));
return $template->assign_display('captcha'); return 'captcha_default.html';
} }
function get_demo_template($id) function get_demo_template($id)
{ {
global $config, $user, $template, $phpbb_admin_path, $phpEx; global $config, $user, $template, $phpbb_admin_path, $phpEx;
$template->set_filenames(array(
'captcha_demo' => 'captcha_default_acp_demo.html')
);
$variables = ''; $variables = '';
if (is_array($this->captcha_vars)) if (is_array($this->captcha_vars))
@ -124,7 +122,7 @@ class phpbb_default_captcha
'CONFIRM_ID' => $this->confirm_id, 'CONFIRM_ID' => $this->confirm_id,
)); ));
return $template->assign_display('captcha_demo'); return 'captcha_default_acp_demo.html';
} }
function get_hidden_fields() function get_hidden_fields()

2
phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php
View file

@ -34,7 +34,7 @@ class phpbb_captcha_gd extends phpbb_default_captcha
'captcha_gd_x_grid' => 'CAPTCHA_GD_X_GRID', 'captcha_gd_x_grid' => 'CAPTCHA_GD_X_GRID',
'captcha_gd_y_grid' => 'CAPTCHA_GD_Y_GRID', 'captcha_gd_y_grid' => 'CAPTCHA_GD_Y_GRID',
'captcha_gd_foreground_noise' => 'CAPTCHA_GD_FOREGROUND_NOISE', 'captcha_gd_foreground_noise' => 'CAPTCHA_GD_FOREGROUND_NOISE',
'captcha_gd' => 'CAPTCHA_GD_PREVIEWED', // 'captcha_gd' => 'CAPTCHA_GD_PREVIEWED',
'captcha_gd_wave' => 'CAPTCHA_GD_WAVE', 'captcha_gd_wave' => 'CAPTCHA_GD_WAVE',
'captcha_gd_3d_noise' => 'CAPTCHA_GD_3D_NOISE', 'captcha_gd_3d_noise' => 'CAPTCHA_GD_3D_NOISE',
'captcha_gd_fonts' => 'CAPTCHA_GD_FONTS', 'captcha_gd_fonts' => 'CAPTCHA_GD_FONTS',

6
phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
View file

@ -128,10 +128,6 @@ class phpbb_recaptcha extends phpbb_default_captcha
{ {
global $config, $user, $template; global $config, $user, $template;
$template->set_filenames(array(
'captcha' => 'captcha_recaptcha.html')
);
$template->assign_vars(array( $template->assign_vars(array(
'RECAPTCHA_SERVER' => $this->recaptcha_server, 'RECAPTCHA_SERVER' => $this->recaptcha_server,
'RECAPTCHA_PUBKEY' => isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '', 'RECAPTCHA_PUBKEY' => isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '',
@ -139,7 +135,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
'S_RECAPTCHA_AVAILABLE' => $this->is_available(), 'S_RECAPTCHA_AVAILABLE' => $this->is_available(),
)); ));
return $template->assign_display('captcha'); return 'captcha_recaptcha.html';
} }
function get_demo_template($id) function get_demo_template($id)

2
phpBB/includes/functions.php
View file

@ -2702,7 +2702,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
$template->assign_vars(array( $template->assign_vars(array(
'S_CONFIRM_CODE' => true, 'S_CONFIRM_CODE' => true,
'CONFIRM' => $captcha->get_template(''), 'CAPTCHA_TEMPLATE' => $captcha->get_template(),
)); ));
$err = $user->lang[$result['error_msg']]; $err = $user->lang[$result['error_msg']];

5
phpBB/includes/ucp/ucp_register.php
View file

@ -42,7 +42,6 @@ class ucp_register
$submit = (isset($_POST['submit'])) ? true : false; $submit = (isset($_POST['submit'])) ? true : false;
$change_lang = request_var('change_lang', ''); $change_lang = request_var('change_lang', '');
$user_lang = request_var('lang', $user->lang_name); $user_lang = request_var('lang', $user->lang_name);
$confirm_refresh= (isset($_POST['confirm_refresh']) && $config['confirm_refresh']) ? ((!empty($_POST['confirm_refresh'])) ? 1 : 0) : false;
if ($agreed) if ($agreed)
{ {
@ -437,7 +436,7 @@ class ucp_register
// Visual Confirmation - Show images // Visual Confirmation - Show images
if ($config['enable_confirm'] && !$captcha_solved) if ($config['enable_confirm'] && !$captcha_solved)
{ {
if ($change_lang || $confirm_refresh) if ($change_lang)
{ {
$str = '&amp;change_lang=' . $change_lang; $str = '&amp;change_lang=' . $change_lang;
} }
@ -448,7 +447,7 @@ class ucp_register
$template->assign_vars(array( $template->assign_vars(array(
'L_CONFIRM_EXPLAIN' => sprintf($user->lang['CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>'), 'L_CONFIRM_EXPLAIN' => sprintf($user->lang['CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>'),
'S_CAPTCHA' => $captcha->get_template(), 'CAPTCHA_TEMPLATE' => $captcha->get_template(),
)); ));
} }

2
phpBB/posting.php
View file

@ -1250,7 +1250,7 @@ if ($config['enable_post_confirm'] && !$user->data['is_registered'] && $solved_c
$template->assign_vars(array( $template->assign_vars(array(
'S_CONFIRM_CODE' => true, 'S_CONFIRM_CODE' => true,
'CONFIRM' => $captcha->get_template(), 'CAPTCHA_TEMPLATE' => $captcha->get_template(),
)); ));
} }

4
phpBB/styles/prosilver/template/captcha_default.html
View file

@ -1,9 +1,9 @@
<dl> <dl>
<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt> <dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt>
<dd><img src="{CONFIRM_IMAGE}" alt="" /></dd> <dd><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>
<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" class="inputbox narrow" title="{L_CONFIRM_CODE}" /> <dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" class="inputbox narrow" title="{L_CONFIRM_CODE}" />
<!-- IF S_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF --> <!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF -->
<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd> <input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd>
<dd>{L_CONFIRM_CODE_EXPLAIN}</dd> <dd>{L_CONFIRM_CODE_EXPLAIN}</dd>
</dl> </dl>

2
phpBB/styles/prosilver/template/captcha_recaptcha.html
View file

@ -9,10 +9,12 @@
</script> </script>
<noscript> <noscript>
<div>
<iframe src="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" height="300" width="500" frameborder="0"></iframe><br /> <iframe src="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" height="300" width="500" frameborder="0"></iframe><br />
<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea> <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
<input type="hidden" name="recaptcha_response_field" value="manual_challenge" /> <input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
</noscript> </noscript>
</div>
</dl> </dl>
<!-- ELSE --> <!-- ELSE -->
{L_RECAPTCHA_NOT_AVAILABLE} {L_RECAPTCHA_NOT_AVAILABLE}

4
phpBB/styles/prosilver/template/login_body.html
View file

@ -21,8 +21,8 @@
<!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF --> <!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF -->
<!-- ENDIF --> <!-- ENDIF -->
</dl> </dl>
<!-- IF S_CONFIRM_CODE --> <!-- IF CAPTCHA_TEMPLATE -->
{CONFIRM} <!-- INCLUDE {CAPTCHA_TEMPLATE} -->
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_DISPLAY_FULL_LOGIN --> <!-- IF S_DISPLAY_FULL_LOGIN -->
<dl> <dl>

2
phpBB/styles/prosilver/template/posting_editor.html
View file

@ -100,7 +100,7 @@
<dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->60<!-- ELSE -->64<!-- ENDIF -->" tabindex="2" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd> <dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->60<!-- ELSE -->64<!-- ENDIF -->" tabindex="2" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd>
</dl> </dl>
<!-- IF S_CONFIRM_CODE --> <!-- IF S_CONFIRM_CODE -->
{CONFIRM} <!-- INCLUDE {CAPTCHA_TEMPLATE} -->
<!-- ENDIF --> <!-- ENDIF -->
<!-- ENDIF --> <!-- ENDIF -->

5
phpBB/styles/prosilver/template/ucp_register.html
View file

@ -71,7 +71,7 @@
</dl> </dl>
<!-- END profile_fields --> <!-- END profile_fields -->
</fieldset> </fieldset>
<!-- IF S_CAPTCHA --> <!-- IF CAPTCHA_TEMPLATE -->
<span class="corners-bottom"><span></span></span></div> <span class="corners-bottom"><span></span></span></div>
</div> </div>
@ -82,7 +82,8 @@
<p>{L_CONFIRM_EXPLAIN}</p> <p>{L_CONFIRM_EXPLAIN}</p>
<fieldset class="fields2"> <fieldset class="fields2">
{S_CAPTCHA}
<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
</fieldset> </fieldset>

11
phpBB/styles/subsilver2/template/captcha_default.html
View file

@ -2,18 +2,15 @@
<th colspan="2" valign="middle">{L_CONFIRM_CODE}</th> <th colspan="2" valign="middle">{L_CONFIRM_CODE}</th>
</tr> </tr>
<tr> <tr>
<td class="row3" colspan="2"><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}</span></td> <td class="row3" colspan="2"><span class="gensmall">{L_CONFIRM_EXPLAIN}</span></td>
</tr> </tr>
<tr> <tr>
<td class="row1" colspan="2" align="center"><img src="{CONFIRM_IMAGE}" alt="{L_CONFIRM_CODE}" /> <td class="row1" colspan="2" align="center"><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" />
<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd> <input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></td>
</td>
</tr> </tr>
<tr> <tr>
<td class="row1"><b class="genmed">{L_CONFIRM_CODE}: </b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN} <td class="row1"><b class="genmed">{L_CONFIRM_CODE}: </b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}
</span></td> </span></td>
<td class="row2"><input class="post" type="text" name="confirm_code" size="8" maxlength="8" /> <td class="row2"><input class="post" type="text" name="confirm_code" size="8" maxlength="8" />
<!-- IF S_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF --></td> <!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF --></td>
</tr> </tr>

4
phpBB/styles/subsilver2/template/login_body.html
View file

@ -65,11 +65,11 @@
</td> </td>
</tr> </tr>
<!-- IF S_CAPTCHA --> <!-- IF S_CONFIRM_CODE -->
</table> </table>
<table class="tablebg" width="100%" cellspacing="1"> <table class="tablebg" width="100%" cellspacing="1">
{S_CAPTCHA} <!-- INCLUDE {CAPTCHA_TEMPLATE} -->
<!-- ENDIF --> <!-- ENDIF -->
<tr> <tr>

4
phpBB/styles/subsilver2/template/posting_body.html
View file

@ -332,8 +332,8 @@
</tr> </tr>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_CAPTCHA --> <!-- IF S_CONFIRM_CODE -->
{S_CAPTCHA} <!-- INCLUDE {CAPTCHA_TEMPLATE} -->
<!-- ENDIF --> <!-- ENDIF -->

5
phpBB/styles/subsilver2/template/ucp_register.html
View file

@ -75,10 +75,11 @@
</td> </td>
<td class="row2">{profile_fields.FIELD}<!-- IF profile_fields.ERROR --><br /><span class="gensmall error">{profile_fields.ERROR}</span><!-- ENDIF --></td> <td class="row2">{profile_fields.FIELD}<!-- IF profile_fields.ERROR --><br /><span class="gensmall error">{profile_fields.ERROR}</span><!-- ENDIF --></td>
</tr> </tr>
<!-- END profile_fields --> <!-- END profile_fields -->
<!-- IF S_CAPTCHA --> <!-- IF CAPTCHA_TEMPLATE -->
{S_CAPTCHA} <!-- INCLUDE {CAPTCHA_TEMPLATE} -->
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_COPPA --> <!-- IF S_COPPA -->