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

[ticket/15676] Simplify link text and use privacy link in cookie notice

Browse source 
PHPBB3-15676
This commit is contained in:
Marc Alexander 2018-05-31 22:15:36 +02:00
parent c6a35237a2
commit 25a46ef4b3
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/functions.php
View file

@ -2471,6 +2471,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
'U_RESEND_ACTIVATION' => ($config['require_activation'] == USER_ACTIVATION_SELF && $config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=resend_act') : '', 'U_RESEND_ACTIVATION' => ($config['require_activation'] == USER_ACTIVATION_SELF && $config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=resend_act') : '',
'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'), 'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'),
'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'), 'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'),
'UA_PRIVACY' => addslashes(append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy')),
'S_DISPLAY_FULL_LOGIN' => ($s_display) ? true : false, 'S_DISPLAY_FULL_LOGIN' => ($s_display) ? true : false,
'S_HIDDEN_FIELDS' => $s_hidden_fields, 'S_HIDDEN_FIELDS' => $s_hidden_fields,
@ -4426,6 +4427,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
'U_TEAM' => ($user->data['user_id'] != ANONYMOUS && !$auth->acl_get('u_viewprofile')) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=team'), 'U_TEAM' => ($user->data['user_id'] != ANONYMOUS && !$auth->acl_get('u_viewprofile')) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=team'),
'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'), 'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'),
'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'), 'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'),
'UA_PRIVACY' => addslashes(append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy')),
'U_RESTORE_PERMISSIONS' => ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm') : '', 'U_RESTORE_PERMISSIONS' => ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm') : '',
'U_FEED' => $controller_helper->route('phpbb_feed_index'), 'U_FEED' => $controller_helper->route('phpbb_feed_index'),

2
phpBB/language/en/common.php
View file

@ -608,6 +608,7 @@ $lang = array_merge($lang, array(
'PREVIOUS' => 'Previous', // Used in pagination 'PREVIOUS' => 'Previous', // Used in pagination
'PREVIOUS_STEP' => 'Previous', 'PREVIOUS_STEP' => 'Previous',
'PRIVACY' => 'Privacy policy', 'PRIVACY' => 'Privacy policy',
'PRIVACY_LINK' => 'Privacy',
'PRIVATE_MESSAGE' => 'Private message', 'PRIVATE_MESSAGE' => 'Private message',
'PRIVATE_MESSAGES' => 'Private messages', 'PRIVATE_MESSAGES' => 'Private messages',
'PRIVATE_MESSAGING' => 'Private messaging', 'PRIVATE_MESSAGING' => 'Private messaging',
@ -732,6 +733,7 @@ $lang = array_merge($lang, array(
'SUBMIT' => 'Submit', 'SUBMIT' => 'Submit',
'TB' => 'TB', 'TB' => 'TB',
'TERMS_LINK' => 'Terms',
'TERMS_USE' => 'Terms of use', 'TERMS_USE' => 'Terms of use',
'TEST_CONNECTION' => 'Test connection', 'TEST_CONNECTION' => 'Test connection',
'THE_TEAM' => 'The team', 'THE_TEAM' => 'The team',

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

@ -11,7 +11,7 @@
{CREDIT_LINE} {CREDIT_LINE}
<!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF --> <!-- IF TRANSLATION_INFO --><br />{TRANSLATION_INFO}<!-- ENDIF -->
<!-- EVENT overall_footer_copyright_append --> <!-- EVENT overall_footer_copyright_append -->
<br><a href="{U_PRIVACY}" title="{L_PRIVACY}" role="menuitem"><span>{L_PRIVACY}</span></a>&nbsp;&vert;&nbsp;<a href="{U_TERMS_USE}" title="{L_TERMS_USE}" role="menuitem"><span>{L_TERMS_USE}</span></a> <br><a href="{U_PRIVACY}" title="{L_PRIVACY_LINK}" role="menuitem"><span>{L_PRIVACY_LINK}</span></a>&nbsp;&vert;&nbsp;<a href="{U_TERMS_USE}" title="{L_TERMS_LINK}" role="menuitem"><span>{L_TERMS_LINK}</span></a>
<!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF --> <!-- IF DEBUG_OUTPUT --><br />{DEBUG_OUTPUT}<!-- ENDIF -->
<!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF --> <!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->
</div> </div>
@ -79,7 +79,7 @@
"message": "{LA_COOKIE_CONSENT_MSG}", "message": "{LA_COOKIE_CONSENT_MSG}",
"dismiss": "{LA_COOKIE_CONSENT_OK}", "dismiss": "{LA_COOKIE_CONSENT_OK}",
"link": "{LA_COOKIE_CONSENT_INFO}", "link": "{LA_COOKIE_CONSENT_INFO}",
"href": "{LA_COOKIE_CONSENT_HREF}" "href": "{UA_PRIVACY}"
} }
}); });
}); });