IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Code for #1309

Browse Source
This commit is contained in:
James Cole 2018-04-01 16:00:15 +02:00
parent 093bdd6090
commit 66019fdbbf
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Repositories/ImportJob/ImportJobRepository.php
View File

@ -256,14 +256,28 @@ class ImportJobRepository implements ImportJobRepositoryInterface
*/ */
public function processFile(ImportJob $job, ?UploadedFile $file): bool public function processFile(ImportJob $job, ?UploadedFile $file): bool
{ {
if (is_null($file)) { if (null === $file) {
return false; return false;
} }
/** @var UserRepositoryInterface $repository */ /** @var UserRepositoryInterface $repository */
$repository = app(UserRepositoryInterface::class); $repository = app(UserRepositoryInterface::class);
$newName = sprintf('%s.upload', $job->key); $newName = sprintf('%s.upload', $job->key);
$uploaded = new SplFileObject($file->getRealPath()); $uploaded = new SplFileObject($file->getRealPath());
$content = trim($uploaded->fread($uploaded->getSize())); $content = trim($uploaded->fread($uploaded->getSize()));
// verify content:
$result = mb_detect_encoding($content, 'UTF-8', true);
if ($result === false) {
Log::error(sprintf('Cannot detect encoding for uploaded import file "%s".', $file->getClientOriginalName()));
return false;
}
if ($result !== 'ASCII' && $result !== 'UTF-8') {
Log::error(sprintf('Uploaded import file is %s instead of UTF8!', var_export($result, true)));
return false;
}
$contentEncrypted = Crypt::encrypt($content); $contentEncrypted = Crypt::encrypt($content);
$disk = Storage::disk('upload'); $disk = Storage::disk('upload');