DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Only gtry to delete the file if a record is found in the log

Browse source
This commit is contained in:
snipe 2019-05-24 15:44:40 -07:00
parent d596ced0a0
commit 18db0a50f1
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/Http/Controllers/LicensesController.php
View file

@ -548,18 +548,21 @@ class LicensesController extends Controller
if ($license) { if ($license) {
$this->authorize('edit', $license); $this->authorize('edit', $license);
$log = Actionlog::find($fileId); $log = Actionlog::find($fileId);
$full_filename = $destinationPath.'/'.$log->filename; if ($log) {
if (file_exists($full_filename)) { $full_filename = $destinationPath.'/'.$log->filename;
unlink($destinationPath.'/'.$log->filename); if (file_exists($full_filename)) {
unlink($destinationPath.'/'.$log->filename);
}
$log->delete();
return redirect()->back()->with('success', trans('admin/licenses/message.deletefile.success'));
} }
$log->delete();
return redirect()->back()->with('success', trans('admin/licenses/message.deletefile.success')); return redirect()->back()->with('error', 'Could not locate that file.');
} }
// Prepare the error message
$error = trans('admin/licenses/message.does_not_exist', compact('id'));
// Redirect to the licence management page // Redirect to the licence management page
return redirect()->route('licenses.index')->with('error', $error); return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist', compact('id')));
} }