Skip to content

Commit 0e4d2b6

Browse files
committed
Fix bug bcit-ci#195
Fixes bug bcit-ci#195 regarding non-existent user agent strings when using force_download() helper.
1 parent 96db8f9 commit 0e4d2b6

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

system/helpers/download_helper.php

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -88,26 +88,20 @@ function force_download($filename = '', $data = '')
8888
{
8989
$mime = (is_array($mimes[$extension])) ? $mimes[$extension][0] : $mimes[$extension];
9090
}
91-
91+
9292
// Generate the server headers
93-
if (strpos($_SERVER['HTTP_USER_AGENT'], "MSIE") !== FALSE)
93+
header('Content-Type: "'.$mime.'"');
94+
header('Content-Disposition: attachment; filename="'.$filename.'"');
95+
header('Expires: 0');
96+
header("Content-Transfer-Encoding: binary");
97+
header("Content-Length: ".strlen($data));
98+
header('Pragma: no-cache');
99+
100+
// Internet Explorer-specific headers.
101+
if (isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'], "MSIE") !== FALSE)
94102
{
95-
header('Content-Type: "'.$mime.'"');
96-
header('Content-Disposition: attachment; filename="'.$filename.'"');
97-
header('Expires: 0');
98103
header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
99-
header("Content-Transfer-Encoding: binary");
100104
header('Pragma: public');
101-
header("Content-Length: ".strlen($data));
102-
}
103-
else
104-
{
105-
header('Content-Type: "'.$mime.'"');
106-
header('Content-Disposition: attachment; filename="'.$filename.'"');
107-
header("Content-Transfer-Encoding: binary");
108-
header('Expires: 0');
109-
header('Pragma: no-cache');
110-
header("Content-Length: ".strlen($data));
111105
}
112106

113107
exit($data);

0 commit comments

Comments
 (0)