holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"fixed application/rtf display instead of download"

Browse Source
This commit is contained in:
Ralf Becker 2007-07-20 10:57:14 +00:00
parent a32c51ad61
commit ed29218b5d
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
filemanager/inc/class.uifilemanager.inc.php
View File

@ -1827,28 +1827,27 @@
$mime_type='unknown'; $mime_type='unknown';
$ls_array = $this->vfs->ls(array( $ls_array = $this->vfs->ls(array(
'string' => $this->path.'/'.$this->file,//FIXME 'string' => $this->path.'/'.$this->file,//FIXME
'relatives' => array(RELATIVE_ALL), 'relatives' => array(RELATIVE_ROOT),
'checksubdirs' => False, 'checksubdirs' => False,
'nofiles' => True 'nofiles' => True
)); ));
if($ls_array[0]['mime_type'] && $ls_array[0]['mime_type'] != 'application/octet-stream')
if($ls_array[0]['mime_type'])
{ {
$mime_type = $ls_array[0]['mime_type']; $mime_type = $ls_array[0]['mime_type'];
} }
else else
{ {
$parts = explode('.',$this->file); $parts = explode('.',$this->file);
$_ext = array_pop($parts); $_ext = array_pop($parts);
$mime_type = ExecMethod('phpgwapi.mime_magic.ext2mime',$_ext); $mime_type = ExecMethod('phpgwapi.mime_magic.ext2mime',$_ext);
} }
// check if the prefs are set for viewing unknown extensions as text/plain and // check if the prefs are set for viewing unknown extensions as text/plain and
// check if the mime_type is unknown, empty or not found (application/octet) // check if the mime_type is unknown, empty or not found (application/octet)
// or check if the mimetype contains text, // or check if the mimetype contains text,
// THEN set the mime_type text/plain // THEN set the mime_type text/plain
if(($this->prefs['viewtextplain'] && ($mime_type=='' or $mime_type=='unknown' or $mime_type=='application/octet-stream')) or strpos($mime_type, 'text/')!==false) if(($this->prefs['viewtextplain'] && ($mime_type=='' || $mime_type=='unknown' || $mime_type=='application/octet-stream')) ||
strpos($mime_type, 'text/') !== false)
{ {
$mime_type = 'text/plain'; $mime_type = 'text/plain';
} }
@ -2572,14 +2571,14 @@
$GLOBALS['egw_info']['flags']['app_header'] = lang('filemanager'); $GLOBALS['egw_info']['flags']['app_header'] = lang('filemanager');
foreach ($rows as $key => $row) foreach ($rows as $key => $row)
{ {
$rows[$key]['dir_link']='filemanager.uifilemanager.index&path='.base64_encode($row['vfs_directory']); $rows[$key]['dir_link']='filemanager.uifilemanager.index&path='.urlencode(base64_encode($row['vfs_directory']));
if (strtolower($row['vfs_mime_type']) == 'directory') if (strtolower($row['vfs_mime_type']) == 'directory')
{ {
$rows[$key]['file_link']='filemanager.uifilemanager.index&path='.base64_encode($row['vfs_directory'].'/'.$row['vfs_name']); $rows[$key]['file_link']='filemanager.uifilemanager.index&path='.urlencode(base64_encode($row['vfs_directory'].'/'.$row['vfs_name']));
} }
else else
{ {
$rows[$key]['file_link']='filemanager.uifilemanager.view&path='.base64_encode($row['vfs_directory']).'&file='.base64_encode($row['vfs_name']); $rows[$key]['file_link']='filemanager.uifilemanager.view&path='.urlencode(base64_encode($row['vfs_directory'])).'&file='.urlencode(base64_encode($row['vfs_name']));
} }
$rows[$key]['icon'] = $this->mime_icon($row['vfs_mime_type'],16,true); $rows[$key]['icon'] = $this->mime_icon($row['vfs_mime_type'],16,true);
$rows[$key]['file'] = $row['vfs_directory'].'/'.$row['vfs_name']; $rows[$key]['file'] = $row['vfs_directory'].'/'.$row['vfs_name'];