composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 07:12:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Protect the download of documents against spurious blank lines coming from nowhere !!

Browse Source 
SVN:trunk[2217]
This commit is contained in:
Denis Flaven
2012-09-26 09:19:43 +00:00
parent 5ed95f3a1c
commit 088fcf9449
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pages/ajax.render.php
View File

@@ -829,6 +829,7 @@ try
catch (Exception $e) catch (Exception $e)
{ {
echo $e->GetMessage(); echo $e->GetMessage();
echo "<p>Debug trace: <pre>".print_r($e->getTrace(), true)."</pre></p>\n";
IssueLog::Error($e->getMessage()); IssueLog::Error($e->getMessage());
} }
@@ -856,6 +857,12 @@ function DownloadDocument(WebPage $oPage, $sClass, $id, $sAttCode, $sContentDisp
$oDocument = $oObj->Get($sAttCode); $oDocument = $oObj->Get($sAttCode);
if (is_object($oDocument)) if (is_object($oDocument))
{ {
// Make sure there is NO output at all before our content, otherwise the document will be corrupted
$sPreviousContent = ob_get_clean();
if (trim($sPreviousContent) != '')
{
IssueLog::Error("Output already started before downloading file:\nContent was:'$sPreviousContent'\n");
}
$oPage->SetContentType($oDocument->GetMimeType()); $oPage->SetContentType($oDocument->GetMimeType());
$oPage->SetContentDisposition($sContentDisposition,$oDocument->GetFileName()); $oPage->SetContentDisposition($sContentDisposition,$oDocument->GetFileName());
$oPage->add($oDocument->GetData()); $oPage->add($oDocument->GetData());