diff --git a/lib/storage/ondiskhashedstoragemanager.inc.php b/lib/storage/ondiskhashedstoragemanager.inc.php index 0d55add..7bb96c8 100644 --- a/lib/storage/ondiskhashedstoragemanager.inc.php +++ b/lib/storage/ondiskhashedstoragemanager.inc.php @@ -9,31 +9,31 @@ * Document Management Made Simple * Copyright (C) 2008 KnowledgeTree Inc. * Portions copyright The Jam Warehouse Software (Pty) Limited - * + * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License version 3 as published by the * Free Software Foundation. - * + * * This program is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * - * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, + * + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco, * California 94120-7775, or email info@knowledgetree.com. - * + * * The interactive user interfaces in modified source and object code versions * of this program must display Appropriate Legal Notices, as required under * Section 5 of the GNU General Public License version 3. - * + * * In accordance with Section 7(b) of the GNU General Public License version 3, * these Appropriate Legal Notices must retain the display of the "Powered by - * KnowledgeTree" logo and retain the original copyright notice. If the display of the + * KnowledgeTree" logo and retain the original copyright notice. If the display of the * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices - * must display the words "Powered by KnowledgeTree" and retain the original + * must display the words "Powered by KnowledgeTree" and retain the original * copyright notice. * Contributor( s): ______________________________________ */ @@ -194,15 +194,12 @@ class KTOnDiskHashedStorageManager extends KTStorageManager { } if (file_exists($sPath)) { - $oUrlEncodedFileName = $oDocument->getFileName( ); - $browser = $_SERVER['HTTP_USER_AGENT']; - if ( strpos( strtoupper( $browser), 'MSIE') !== false) { - $oUrlEncodedFileName = htmlspecialchars($oUrlEncodedFileName, ENT_QUOTES, 'UTF-8'); - } + $sFileName = $oDocument->getFileName( ); + //set the correct headers header("Content-Type: " . $mimetype); header("Content-Length: ". $oDocument->getFileSize()); - header('Content-Disposition: attachment; filename="' . $oUrlEncodedFileName . '"'); + header('Content-Disposition: attachment; filename="' . $sFileName . '"'); header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); // HTTP/1.1 @@ -215,8 +212,6 @@ class KTOnDiskHashedStorageManager extends KTStorageManager { readfile($sPath); - //$oFile = new KTFSFileLike($sPath); - //KTFileLikeUtil::send_contents($oFile); } else { return false; }