aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-12-28 22:19:12 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-12-28 22:19:12 +0100
commit3ccaac488b77c2eb89a9db9ec025bfd2d14fa648 (patch)
tree936cbac0e500264b7bc849e865c12b5b46257170
parent19b018ece07553db9109162d19fd2808cabf46c1 (diff)
parent5f6fa321efd5ee3761be28a8d3e77d1901fd504f (diff)
downloadforums-3ccaac488b77c2eb89a9db9ec025bfd2d14fa648.tar
forums-3ccaac488b77c2eb89a9db9ec025bfd2d14fa648.tar.gz
forums-3ccaac488b77c2eb89a9db9ec025bfd2d14fa648.tar.bz2
forums-3ccaac488b77c2eb89a9db9ec025bfd2d14fa648.tar.xz
forums-3ccaac488b77c2eb89a9db9ec025bfd2d14fa648.zip
Merge pull request #4531 from senky/ticket/14817
[ticket/14817] Add core.send_file_to_browser_before
-rw-r--r--phpBB/includes/functions_download.php22
1 files changed, 21 insertions, 1 deletions
diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php
index 86c60c31ff..053e362682 100644
--- a/phpBB/includes/functions_download.php
+++ b/phpBB/includes/functions_download.php
@@ -124,7 +124,7 @@ function wrap_img_in_html($src, $title)
*/
function send_file_to_browser($attachment, $upload_dir, $category)
{
- global $user, $db, $config, $phpbb_root_path;
+ global $user, $db, $config, $phpbb_dispatcher, $phpbb_root_path;
$filename = $phpbb_root_path . $upload_dir . '/' . $attachment['physical_filename'];
@@ -149,6 +149,26 @@ function send_file_to_browser($attachment, $upload_dir, $category)
// Now send the File Contents to the Browser
$size = @filesize($filename);
+ /**
+ * Event to alter attachment before it is sent to browser.
+ *
+ * @event core.send_file_to_browser_before
+ * @var array attachment Attachment data
+ * @var string upload_dir Relative path of upload directory
+ * @var int category Attachment category
+ * @var string filename Path to file, including filename
+ * @var int size File size
+ * @since 3.1.11-RC1
+ */
+ $vars = array(
+ 'attachment',
+ 'upload_dir',
+ 'category',
+ 'filename',
+ 'size',
+ );
+ extract($phpbb_dispatcher->trigger_event('core.send_file_to_browser_before', compact($vars)));
+
// To correctly display further errors we need to make sure we are using the correct headers for both (unsetting content-length may not work)
// Check if headers already sent or not able to get the file contents.