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

"Fixed bugs reported by uwe.redecker-at-hspl.de on the german list"

Browse Source
This commit is contained in:
Ralf Becker 2008-03-04 07:35:05 +00:00
parent acd8659508
commit 9327beb6e4
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

@ -144,8 +144,9 @@ class filemanager_ui
{ {
$dir_is_writable = egw_vfs::is_writable($content['nm']['path']); $dir_is_writable = egw_vfs::is_writable($content['nm']['path']);
} }
$content['paste_tooltip'] = '<p><b>'.lang('%1 the following files into current directory', $content['paste_tooltip'] = $clipboard_files ? '<p><b>'.lang('%1 the following files into current directory',
$clipboard_type=='copy'?lang('Copy'):lang('Move')).':</b><br />'.implode('<br />',$clipboard_files).'</p>'; $clipboard_type=='copy'?lang('Copy'):lang('Move')).':</b><br />'.implode('<br />',$clipboard_files).'</p>' :
'';
//_debug_array($content); //_debug_array($content);
$readonlys['button[paste]'] = !$clipboard_files; $readonlys['button[paste]'] = !$clipboard_files;
@ -220,7 +221,7 @@ class filemanager_ui
if (!egw_vfs::is_dir($path)) if (!egw_vfs::is_dir($path))
{ {
$to = $dir.'/'.egw_vfs::basename($path); $to = $dir.'/'.egw_vfs::basename($path);
if (egw_vfs::copy($path,$to)) if ($path != $to && egw_vfs::copy($path,$to))
{ {
++$files; ++$files;
} }
@ -235,6 +236,11 @@ class filemanager_ui
foreach(egw_vfs::find($path) as $p) foreach(egw_vfs::find($path) as $p)
{ {
$to = $dir.substr($p,$len); $to = $dir.substr($p,$len);
if ($to == $p) // cant copy into itself!
{
++$errs;
continue;
}
if (($is_dir = egw_vfs::is_dir($p)) && egw_vfs::mkdir($to,null,STREAM_MKDIR_RECURSIVE)) if (($is_dir = egw_vfs::is_dir($p)) && egw_vfs::mkdir($to,null,STREAM_MKDIR_RECURSIVE))
{ {
++$dirs; ++$dirs;
@ -260,7 +266,7 @@ class filemanager_ui
foreach($selected as $path) foreach($selected as $path)
{ {
$to = $dir.'/'.egw_vfs::basename($path); $to = $dir.'/'.egw_vfs::basename($path);
if (egw_vfs::rename($path,$to)) if ($path != $to && egw_vfs::rename($path,$to))
{ {
++$files; ++$files;
} }