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

[ticket/12831] Optn to prevent setting HTTP headers

Browse source 
https://tracker.phpbb.com/browse/PHPBB3-12831

PHPBB3-12831
This commit is contained in:
omniError 2014-07-13 14:01:50 -05:00
parent aadcbb765a
commit a7794b765c
2 changed files with 44 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/includes/functions.php
View file

@ -5030,6 +5030,9 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
'SITE_LOGO_IMG' => $user->img('site_logo'), 'SITE_LOGO_IMG' => $user->img('site_logo'),
)); ));
// A listener can set this variable to `false` when it wants to prevent setting of headers
$page_header_set_headers = true;
/** /**
* Execute code and/or overwrite _common_ template variables after they have been assigned. * Execute code and/or overwrite _common_ template variables after they have been assigned.
* *
@ -5040,12 +5043,17 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
* session item, e.g. forum for * session item, e.g. forum for
* session_forum_id * session_forum_id
* @var int item_id Restrict online users to item id * @var int item_id Restrict online users to item id
* @var bool page_header_set_headers Set to false if phpBB should not
* set HTTP headers (since you have
* set them elsewhere).
* *
* @since 3.1.0-b3 * @since 3.1.0-b3
*/ */
$vars = array('page_title', 'display_online_list', 'item_id', 'item'); $vars = array('page_title', 'display_online_list', 'item_id', 'item', 'page_header_set_headers');
extract($phpbb_dispatcher->trigger_event('core.page_header_after', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.page_header_after', compact($vars)));
if ($page_header_set_headers)
{
// application/xhtml+xml not used because of IE // application/xhtml+xml not used because of IE
header('Content-type: text/html; charset=UTF-8'); header('Content-type: text/html; charset=UTF-8');
@ -5058,6 +5066,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
// Let reverse proxies know we detected a bot. // Let reverse proxies know we detected a bot.
header('X-PHPBB-IS-BOT: yes'); header('X-PHPBB-IS-BOT: yes');
} }
}
return; return;
} }

19
phpBB/includes/functions_acp.php
View file

@ -107,12 +107,31 @@ function adm_page_header($page_title)
'S_CONTENT_FLOW_END' => ($user->lang['DIRECTION'] == 'ltr') ? 'right' : 'left', 'S_CONTENT_FLOW_END' => ($user->lang['DIRECTION'] == 'ltr') ? 'right' : 'left',
)); ));
// A listener can set this variable to `false` when it wants to prevent setting of headers
$adm_page_header_set_headers = true;
/**
* Execute code and/or overwrite _common_ template variables after they have been assigned.
*
* @event core.adm_page_header_after
* @var string page_title Page title
* @var bool adm_page_header_set_headers Set to false if phpBB should not
* set HTTP headers (useful for integrators).
*
* @since 3.1.0-RC3
*/
$vars = array('page_title', 'adm_page_header_set_headers');
extract($phpbb_dispatcher->trigger_event('core.adm_page_header_after', compact($vars)));
if ($adm_page_header_set_headers)
{
// application/xhtml+xml not used because of IE // application/xhtml+xml not used because of IE
header('Content-type: text/html; charset=UTF-8'); header('Content-type: text/html; charset=UTF-8');
header('Cache-Control: private, no-cache="set-cookie"'); header('Cache-Control: private, no-cache="set-cookie"');
header('Expires: 0'); header('Expires: 0');
header('Pragma: no-cache'); header('Pragma: no-cache');
}
return; return;
} }