lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: can delete an import file with dialog confirm

Browse Source
This commit is contained in:
Regis Houssin 2012-09-03 17:14:33 +02:00
parent fc29e7c432
commit 1abc87f642
4 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/lib/security.lib.php
View File

@ -271,7 +271,8 @@ function restrictedArea($user, $features, $objectid=0, $dbtablename='', $feature
{
//print '<br>feature='.$feature.' creer='.$user->rights->$feature->supprimer.' write='.$user->rights->$feature->delete;
if (empty($user->rights->$feature->supprimer)
&& empty($user->rights->$feature->delete)) $deleteok=0;
&& empty($user->rights->$feature->delete)
&& empty($user->rights->$feature->run)) $deleteok=0;
}
}

26
htdocs/imports/import.php
View File

@ -206,9 +206,25 @@ if ($step == 3 && $datatoimport)
else
{
$langs->load("errors");
$mesg = $langs->trans("ErrorFailedToSaveFile");
setEventMessage($langs->trans("ErrorFailedToSaveFile"), 'errors');
}
}
// Delete file
if ($action == 'confirm_deletefile' && $confirm == 'yes')
{
$langs->load("other");
$param='&datatoimport='.$datatoimport.'&format='.$format;
if ($excludefirstline) $param.='&excludefirstline=1';
$file = $conf->import->dir_temp . '/' . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
$ret=dol_delete_file($file);
if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
Header('Location: '.$_SERVER["PHP_SELF"].'?step='.$step.$param);
exit;
}
}
if ($step == 4 && $action == 'select_model')
@ -306,7 +322,7 @@ if ($step == 1 || ! $datatoimport)
$array_match_file_to_database=array();
$_SESSION["dol_array_match_file_to_database"]='';
$parm='';
$param='';
if ($excludefirstline) $param.='&excludefirstline=1';
llxHeader('',$langs->trans("NewImport"),'EN:Module_Imports_En|FR:Module_Imports|ES:M&oacute;dulo_Importaciones');
@ -448,7 +464,7 @@ if ($step == 3 && $datatoimport)
llxHeader('',$langs->trans("NewImport"),'EN:Module_Imports_En|FR:Module_Imports|ES:M&oacute;dulo_Importaciones');
$head = import_prepare_head($param,3);
$head = import_prepare_head($param, 3);
dol_fiche_head($head, 'step3', $langs->trans("NewImport"));
@ -543,8 +559,6 @@ if ($step == 3 && $datatoimport)
print '<tr '.$bc[$var].'>';
print '<td width="16">'.img_mime($file).'</td>';
print '<td>';
$modulepart='import';
//$relativepath=$filetoimport;
print '<a href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=3'.$param.'" target="_blank">';
print $file;
print '</a>';
@ -558,7 +572,7 @@ if ($step == 3 && $datatoimport)
print '">'.img_delete().'</a></td>';
// Action button
print '<td align="right">';
print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=4'.$param.'&filetoimport='.urlencode($relativepath).'">'.img_picto($langs->trans("NewImport"),'filenew').'</a>';
print '<a href="'.$_SERVER['PHP_SELF'].'?step=4'.$param.'&filetoimport='.urlencode($relativepath).'">'.img_picto($langs->trans("NewImport"),'filenew').'</a>';
print '</td>';
print '</tr>';
}

1
htdocs/langs/en_US/other.lang
View File

@ -169,6 +169,7 @@ AddFiles=Add Files
StartUpload=Start upload
CancelUpload=Cancel upload
FileIsTooBig=Files is too big
PleaseBePatient=Please be patient...
##### Calendar common #####
AddCalendarEntry=Add entry in calendar %s

2
htdocs/langs/fr_FR/other.lang
View File

@ -168,6 +168,8 @@ AddFiles=Ajouter des fichiers
StartUpload=Transférer
CancelUpload=Annuler le transfert
FileIsTooBig=Le fichier est trop volumineux
PleaseBePatient=Merci de patienter quelques instants...
##### Calendar common #####
AddCalendarEntry=Ajouter entrée dans le calendrier %s
NewCompanyToDolibarr=Société %s ajoutée dans Dolibarr