* Filemanager/eMail: on attaching files to emails from filemanager; if there is a plus sign within the path, we have to encode it, so the file can be found by filesize after urldecode

This commit is contained in:
Klaus Leithoff 2013-07-25 07:54:47 +00:00
parent be0c913c35
commit 2fd1e98eee

View File

@ -413,7 +413,7 @@
!(list($app,$id) = array_slice(explode('/',$path),-3)) || !(list($app,$id) = array_slice(explode('/',$path),-3)) ||
!($name = egw_link::title($app, $id))) !($name = egw_link::title($app, $id)))
{ {
$name = urldecode(egw_vfs::basename($path)); $name = egw_vfs::decodePath(egw_vfs::basename($path));
} }
else else
{ {
@ -422,8 +422,8 @@
$formData = array( $formData = array(
'name' => $name, 'name' => $name,
'type' => $type, 'type' => $type,
'file' => urldecode($path), 'file' => egw_vfs::decodePath($path),
'size' => filesize(urldecode($path)), 'size' => filesize(egw_vfs::decodePath($path)),
); );
if ($formData['type'] == egw_vfs::DIR_MIME_TYPE) continue; // ignore directories if ($formData['type'] == egw_vfs::DIR_MIME_TYPE) continue; // ignore directories
} }