lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Remove forced mime type. What we can force is open dialo but not the mime type.

Browse Source
This commit is contained in:
Laurent Destailleur 2009-10-15 02:40:12 +00:00
parent e1c14b9c3e
commit edf66f1c8d
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/docs/index.php
View File

@ -17,11 +17,11 @@
*/
/**
\file htdocs/docs/index.php
\ingroup document
\brief Page d'accueil module document
\version $Id$
*/
* \file htdocs/docs/index.php
* \ingroup document
* \brief Page d'accueil module document
* \version $Id$
*/
require("./pre.inc.php");
@ -57,7 +57,7 @@ if ($resql)
print '<td>';
$loc = get_exdir($obj->rowid).$obj->rowid.".pdf";
$file = stripslashes($obj->name);
echo '<a href="'.DOL_URL_ROOT.'/document.php?modulepart=ged&type=application/binary&file='.urlencode($loc).'">'.$file.'</a></td>';
echo '<a href="'.DOL_URL_ROOT.'/document.php?modulepart=ged&attachment=1&file='.urlencode($loc).'">'.$file.'</a></td>';
print '<td>'.dol_print_date($obj->date_generation,'dayhour').'</td>';
print "</tr>\n";

1
htdocs/document.php
View File

@ -102,6 +102,7 @@ if (eregi('\.tiff$',$original_file)) { $attachment = true; }
// Calendar
if (eregi('\.vcs$',$original_file)) { $attachment = true; }
if (eregi('\.ics$',$original_file)) { $attachment = true; }
if ($_REQUEST["attachment"]) { $attachment = true; }
if (! empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment=false;
//print "XX".$attachment;exit;

4
htdocs/html.formfile.class.php
View File

@ -414,7 +414,7 @@ class FormFile
* \param object Object on which document is linked to
* \param modulepart Value for modulepart used by download wrapper
* \param param Parameters on sort links
* \param forcedownload Mime type is forced to 'application/binary' to have a download
* \param forcedownload Force to open dialog box "Save As" when clicking on file
* \param relativepath Relative path of docs (autodefined if not provided)
* \param permtodelete Permission to delete
* \param useinecm Change output for use in ecm module
@ -459,7 +459,7 @@ class FormFile
print "<tr $bc[$var]><td>";
//print "XX".$file['name']; //$file['name'] must be utf8
print '<a href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
//if ($forcedownload) print '&type=application/binary';
if ($forcedownload) print '&attachment=1';
print '&file='.urlencode($relativepath.$file['name']).'">';
print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')').' ';
print dol_trunc($file['name'],$maxlength,'middle');

2
htdocs/societe/document.php
View File

@ -237,7 +237,7 @@ if ($socid > 0)
$var=!$var;
print "<tr $bc[$var]><td>";
$loc = "courrier/".get_exdir($socid);
echo '<a href="'.DOL_URL_ROOT.'/document.php?modulepart=societe&type=application/binary&file='.urlencode($loc.'/'.$file).'">'.$file.'</a>';
echo '<a href="'.DOL_URL_ROOT.'/document.php?modulepart=societe&attachment=1&file='.urlencode($loc.'/'.$file).'">'.$file.'</a>';
print "</td>\n";
print '<td align="right">'.dol_print_size(dol_filesize($courrier_dir."/".$file)).'</td>';