Fix: Bad action reset

This commit is contained in:
Laurent Destailleur 2012-05-23 17:49:08 +02:00
parent 190bcf61e4
commit 95b976c3d5

View File

@ -150,26 +150,29 @@ if ($action == 'add' && $user->rights->ecm->setup)
} }
// Remove file // Remove file
if ($action == 'confirm_deletefile' && GETPOST('confirm') == 'yes') if ($action == 'confirm_deletefile')
{ {
$result=$ecmdir->fetch($section); if (GETPOST('confirm') == 'yes')
if (! $result > 0) {
{ $result=$ecmdir->fetch($section);
dol_print_error($db,$ecmdir->error); if (! $result > 0)
exit; {
} dol_print_error($db,$ecmdir->error);
$relativepath=$ecmdir->getRelativePath(); exit;
$upload_dir = $conf->ecm->dir_output.'/'.$relativepath; }
$file = $upload_dir . "/" . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP). $relativepath=$ecmdir->getRelativePath();
$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
$file = $upload_dir . "/" . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
$result=dol_delete_file($file); $result=dol_delete_file($file);
$mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>'; $mesg = '<div class="ok">'.$langs->trans("FileWasRemoved").'</div>';
$result=$ecmdir->changeNbOfFiles('-'); $result=$ecmdir->changeNbOfFiles('-');
$action='file_manager';
clearstatcache(); clearstatcache();
}
$action='file_manager';
} }
// Remove directory // Remove directory