nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #1106146, missing header for PDF

Browse Source
This commit is contained in:
Marc Delisle
2005-01-27 18:06:14 +00:00
parent 3b94630984
commit 886fe0a091
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2005-01-27 Marc Delisle <lem9@users.sourceforge.net>
$ libraries/fpdf/fpdf.php: bug #1106146, missing header for PDF,
thanks to Michal
2005-01-27 Michal Čihař <michal@cihar.com> 2005-01-27 Michal Čihař <michal@cihar.com>
* read_dump.php: Fix detection of SELECT query to display on multiple * read_dump.php: Fix detection of SELECT query to display on multiple
submits (bug #1110727). submits (bug #1110727).

15
libraries/fpdf/fpdf.php
View File

@@ -993,7 +993,8 @@ function SetXY($x,$y)
function Output($name='',$dest='') function Output($name='',$dest='')
{ {
//Output PDF to some destination //Output PDF to some destination
global $HTTP_SERVER_VARS; // lem9
//global $HTTP_SERVER_VARS;
//Finish document if necessary //Finish document if necessary
if($this->state<3) if($this->state<3)
@@ -1016,7 +1017,9 @@ function Output($name='',$dest='')
{ {
case 'I': case 'I':
//Send to standard output //Send to standard output
if(isset($HTTP_SERVER_VARS['SERVER_NAME'])) // lem9
//if(isset($HTTP_SERVER_VARS['SERVER_NAME']))
if(isset($_SERVER['SERVER_NAME']))
{ {
//We send to a browser //We send to a browser
Header('Content-Type: application/pdf'); Header('Content-Type: application/pdf');
@@ -1029,7 +1032,9 @@ function Output($name='',$dest='')
break; break;
case 'D': case 'D':
//Download file //Download file
if(isset($HTTP_SERVER_VARS['HTTP_USER_AGENT']) and strpos($HTTP_SERVER_VARS['HTTP_USER_AGENT'],'MSIE')) // lem9
//if(isset($HTTP_SERVER_VARS['HTTP_USER_AGENT']) and strpos($HTTP_SERVER_VARS['HTTP_USER_AGENT'],'MSIE'))
if(isset($_SERVER['HTTP_USER_AGENT']) and strpos($_SERVER['HTTP_USER_AGENT'],'MSIE'))
Header('Content-Type: application/force-download'); Header('Content-Type: application/force-download');
else else
Header('Content-Type: application/octet-stream'); Header('Content-Type: application/octet-stream');
@@ -1612,7 +1617,9 @@ function _out($s)
} }
//Handle special IE contype request //Handle special IE contype request
if(isset($HTTP_SERVER_VARS['HTTP_USER_AGENT']) and $HTTP_SERVER_VARS['HTTP_USER_AGENT']=='contype') // lem9
//if(isset($HTTP_SERVER_VARS['HTTP_USER_AGENT']) and $HTTP_SERVER_VARS['HTTP_USER_AGENT']=='contype')
if(isset($_SERVER['HTTP_USER_AGENT']) and $_SERVER['HTTP_USER_AGENT']=='contype')
{ {
Header('Content-Type: application/pdf'); Header('Content-Type: application/pdf');
exit; exit;