extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 02:43:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix Scrutinizer "bugs"

Browse Source
This commit is contained in:
Ralf Becker 2016-07-02 12:39:28 +02:00
parent 0914f9670d
commit 0949bae0dc
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
filemanager/inc/class.filemanager_ui.inc.php
View File

@ -333,7 +333,7 @@ class filemanager_ui
$path = static::get_home_dir(); $path = static::get_home_dir();
break; break;
} }
if ($path[0] == '/' && Vfs::stat($path,true) && Vfs::is_dir($path) && Vfs::check_access($path,Vfs::READABLE)) if ($path && $path[0] == '/' && Vfs::stat($path,true) && Vfs::is_dir($path) && Vfs::check_access($path,Vfs::READABLE))
{ {
$content['nm']['path'] = $path; $content['nm']['path'] = $path;
} }
@ -946,7 +946,7 @@ class filemanager_ui
{ {
$content = $stat; $content = $stat;
$content['name'] = $content['itempicker_merge']['name'] = Vfs::basename($path); $content['name'] = $content['itempicker_merge']['name'] = Vfs::basename($path);
$content['dir'] = $content['itempicker_merge']['dir'] = Vfs::decodePath(Vfs::dirname($path)); $content['dir'] = $content['itempicker_merge']['dir'] = ($dir = Vfs::dirname($path)) ? Vfs::decodePath($dir) : '';
$content['path'] = $path; $content['path'] = $path;
$content['hsize'] = Vfs::hsize($stat['size']); $content['hsize'] = Vfs::hsize($stat['size']);
$content['mime'] = Vfs::mime_content_type($path); $content['mime'] = Vfs::mime_content_type($path);
@ -1018,7 +1018,13 @@ class filemanager_ui
{ {
if ($name == 'name') if ($name == 'name')
{ {
$to = Vfs::concat(Vfs::dirname($path),$content['name']); if (!($dir = Vfs::dirname($path)))
{
$msg .= lang('File or directory not found!')." Vfs::dirname('$path')===false";
if ($button == 'save') $button = 'apply';
continue;
}
$to = Vfs::concat($dir, $content['name']);
if (file_exists(Vfs::PREFIX.$to) && $content['confirm_overwrite'] !== $to) if (file_exists(Vfs::PREFIX.$to) && $content['confirm_overwrite'] !== $to)
{ {
$tpl->set_validation_error('name',lang("There's already a file with that name!").'<br />'. $tpl->set_validation_error('name',lang("There's already a file with that name!").'<br />'.
@ -1177,7 +1183,7 @@ class filemanager_ui
$readonlys['perms['.$name.']'] = true; $readonlys['perms['.$name.']'] = true;
} }
} }
$readonlys['name'] = $path == '/' || !Vfs::is_writable(Vfs::dirname($path)); $readonlys['name'] = $path == '/' || !($dir = Vfs::dirname($path)) || !Vfs::is_writable($dir);
$readonlys['comment'] = !Vfs::is_writable($path); $readonlys['comment'] = !Vfs::is_writable($path);
$readonlys['tabs']['filemanager.file.preview'] = $readonlys['tabs']['filemanager.file.perms'] = $content['is_link']; $readonlys['tabs']['filemanager.file.preview'] = $readonlys['tabs']['filemanager.file.perms'] = $content['is_link'];