mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-26 00:29:38 +01:00
- 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:
parent
201f0d33e3
commit
f263ccccb1
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user