- disabling of delete and mail icon did not work for files/folders with quotes in the name

- mail icon was not disabled, if user has no run rights for FMail
This commit is contained in:
Ralf Becker 2010-09-14 17:03:12 +00:00
parent 201f0d33e3
commit f263ccccb1

View File

@ -646,13 +646,15 @@ class filemanager_ui
{ {
$dir_is_writable[$dir] = egw_vfs::is_writable($dir); $dir_is_writable[$dir] = egw_vfs::is_writable($dir);
} }
$path_quoted = str_replace(array('"',"'"),array('"',"\\'"),$path);
if (!$dir_is_writable[$dir]) if (!$dir_is_writable[$dir])
{ {
$readonlys["delete[$path]"] = true; // no rights to delete the file $readonlys["delete[$path_quoted]"] = true; // no rights to delete the file
} }
if (egw_vfs::is_dir($path) || !egw_vfs::is_readable($path)) if (egw_vfs::is_dir($path) || !egw_vfs::is_readable($path) ||
!$GLOBALS['egw_info']['user']['apps']['felamimail'])
{ {
$readonlys["mail[$path]"] = true; $readonlys["mail[$path_quoted]"] = true;
} }
} }
// query comments and cf's for the displayed rows // query comments and cf's for the displayed rows