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

ask only a single time for multiple files and break on other errors, as they reset the selected files anyway

Browse Source
This commit is contained in:
Ralf Becker 2011-07-01 08:08:34 +00:00
parent ac78b77180
commit e45589feea
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -475,6 +475,7 @@ function check_files(upload)
//$response->addAlert(__METHOD__."('$id',".array2string($name).",'$dir')"); //$response->addAlert(__METHOD__."('$id',".array2string($name).",'$dir')");
$ask_overwrite = array();
foreach((array)$names as $name) foreach((array)$names as $name)
{ {
$name = explode('/',str_replace('\\','/',$name)); // in case of win clients $name = explode('/',str_replace('\\','/',$name)); // in case of win clients
@ -487,6 +488,8 @@ function check_files(upload)
{ {
$response->addAlert(lang('You are NOT allowed to upload a script!')); $response->addAlert(lang('You are NOT allowed to upload a script!'));
$response->addScript("document.getElementById('$id').value='';"); $response->addScript("document.getElementById('$id').value='';");
$ask_overwrite = array();
break;
} }
elseif (egw_vfs::stat($path)) elseif (egw_vfs::stat($path))
{ {
@ -494,10 +497,12 @@ function check_files(upload)
{ {
$response->addAlert(lang("There's already a directory with that name!")); $response->addAlert(lang("There's already a directory with that name!"));
$response->addScript("document.getElementById('$id').value='';"); $response->addScript("document.getElementById('$id').value='';");
$ask_overwrite = array();
break;
} }
else else
{ {
$response->addScript("if (!confirm('".addslashes(lang('Do you want to overwrite the existing file %1?',egw_vfs::decodePath($path)))."')) document.getElementById('$id').value='';"); $ask_overwrite[] = egw_vfs::decodePath($path);
} }
} }
else else
@ -505,6 +510,10 @@ function check_files(upload)
// do nothing new file // do nothing new file
} }
} }
if ($ask_overwrite)
{
$response->addScript("if (!confirm('".addslashes(lang('Do you want to overwrite the existing file %1?',implode(', ',$ask_overwrite)))."')) document.getElementById('$id').value='';");
}
return $response->getXML(); return $response->getXML();
} }