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

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2019-05-02 19:39:15 +02:00
commit 42912ba48b
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
4 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/includes/functions.php
View file

@ -2652,6 +2652,9 @@ function login_forum_box($forum_data)
page_header($user->lang['LOGIN']); page_header($user->lang['LOGIN']);
// Add form token for login box
add_form_key('login', '_LOGIN');
$template->assign_vars(array( $template->assign_vars(array(
'FORUM_NAME' => isset($forum_data['forum_name']) ? $forum_data['forum_name'] : '', 'FORUM_NAME' => isset($forum_data['forum_name']) ? $forum_data['forum_name'] : '',
'S_LOGIN_ACTION' => build_url(array('f')), 'S_LOGIN_ACTION' => build_url(array('f')),

1
phpBB/styles/prosilver/template/login_forum.html
View file

@ -25,6 +25,7 @@
<dd><input type="password" tabindex="1" id="password" name="password" size="25" class="inputbox narrow" autocomplete="off" /></dd> <dd><input type="password" tabindex="1" id="password" name="password" size="25" class="inputbox narrow" autocomplete="off" /></dd>
</dl> </dl>
{S_LOGIN_REDIRECT} {S_LOGIN_REDIRECT}
{S_FORM_TOKEN_LOGIN}
<dl> <dl>
<dt>&nbsp;</dt> <dt>&nbsp;</dt>
<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" id="login" class="button1 button button-form" value="{L_LOGIN}" tabindex="2" /></dd> <dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" id="login" class="button1 button button-form" value="{L_LOGIN}" tabindex="2" /></dd>

1
phpBB/styles/prosilver/template/viewforum_body.html
View file

@ -114,6 +114,7 @@
<dd><input type="submit" name="login" tabindex="5" value="{L_LOGIN}" class="button1 button button-form" /></dd> <dd><input type="submit" name="login" tabindex="5" value="{L_LOGIN}" class="button1 button button-form" /></dd>
</dl> </dl>
{S_LOGIN_REDIRECT} {S_LOGIN_REDIRECT}
{S_FORM_TOKEN_LOGIN}
</fieldset> </fieldset>
</div> </div>

3
phpBB/viewforum.php
View file

@ -198,6 +198,9 @@ if (!($forum_data['forum_type'] == FORUM_POST || (($forum_data['forum_flags'] &
// We also make this circumstance available to the template in case we want to display a notice. ;) // We also make this circumstance available to the template in case we want to display a notice. ;)
if (!$auth->acl_gets('f_read', 'f_list_topics', $forum_id)) if (!$auth->acl_gets('f_read', 'f_list_topics', $forum_id))
{ {
// Add form token for login box
add_form_key('login', '_LOGIN');
$template->assign_vars(array( $template->assign_vars(array(
'S_NO_READ_ACCESS' => true, 'S_NO_READ_ACCESS' => true,
)); ));