jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix deleting invoice documents (#2980)

Browse Source
This commit is contained in:
Kevin Papst
2021-11-29 15:57:39 +01:00
committed by GitHub
parent d994339de5
commit 9491f07ade
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Constants.php
View File

@@ -17,11 +17,11 @@ class Constants
/** /**
* The current release version * The current release version
*/ */
public const VERSION = '1.16.5'; public const VERSION = '1.16.6';
/** /**
* The current release: major * 10000 + minor * 100 + patch * The current release: major * 10000 + minor * 100 + patch
*/ */
public const VERSION_ID = 11605; public const VERSION_ID = 11606;
/** /**
* The current release status, either "stable" or "dev" * The current release status, either "stable" or "dev"
*/ */

4
src/Controller/InvoiceController.php
View File

@@ -443,8 +443,8 @@ final class InvoiceController extends AbstractController
$csrfTokenManager->refreshToken('invoice.delete_document'); $csrfTokenManager->refreshToken('invoice.delete_document');
foreach ($documentRepository->findBuiltIn() as $document) { foreach ($documentRepository->findBuiltIn() as $doc) {
if ($document->getId() === $id) { if ($doc->getId() === $id) {
throw new \Exception('Document is built-in and cannot be deleted'); throw new \Exception('Document is built-in and cannot be deleted');
} }
} }

6
src/Repository/InvoiceDocumentRepository.php
View File

@@ -55,7 +55,11 @@ final class InvoiceDocumentRepository
*/ */
public function remove(InvoiceDocument $invoiceDocument): void public function remove(InvoiceDocument $invoiceDocument): void
{ {
@unlink($invoiceDocument->getFilename()); if (stripos($invoiceDocument->getFilename(), $this->getUploadDirectory()) === false) {
throw new \InvalidArgumentException('Cannot delete built-in invoice template');
}
@unlink(realpath($invoiceDocument->getFilename()));
} }
/** /**