kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 02:45:58 +00:00
Code Issues Projects Releases Wiki Activity

Last attempt I hope for #2125

Browse Source
This commit is contained in:
James Cole
2019-02-28 19:56:41 +01:00
parent 39321b320e
commit 3379b723cf
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/Support/Amount.php
View File

@@ -224,23 +224,6 @@ class Amount
return $this->getDefaultCurrencyByUser($user); return $this->getDefaultCurrencyByUser($user);
} }
/**
* @param string $value
*
* @return string
*/
private function tryDecrypt(string $value): string
{
try {
$value = Crypt::decrypt($value);
} catch (DecryptException $e) {
Log::debug(sprintf('Could not decrypt. %s', $e->getMessage()));
}
return $value;
}
/** /**
* @param User $user * @param User $user
* *
@@ -260,7 +243,13 @@ class Amount
// at this point the currency preference could be encrypted, if coming from an old version. // at this point the currency preference could be encrypted, if coming from an old version.
$currencyCode = $this->tryDecrypt((string)$currencyPreference->data); $currencyCode = $this->tryDecrypt((string)$currencyPreference->data);
$currency = TransactionCurrency::where('code', $currencyCode)->first();
// could still be json encoded:
if (\strlen($currencyCode) > 3) {
$currencyCode = null === json_decode($currencyCode) ? 'EUR' : $currencyCode;
}
$currency = TransactionCurrency::where('code', $currencyCode)->first();
if (null === $currency) { if (null === $currency) {
throw new FireflyException(sprintf('No currency found with code "%s"', $currencyCode)); throw new FireflyException(sprintf('No currency found with code "%s"', $currencyCode));
} }
@@ -288,4 +277,20 @@ class Amount
'zero' => $positive, 'zero' => $positive,
]; ];
} }
/**
* @param string $value
*
* @return string
*/
private function tryDecrypt(string $value): string
{
try {
$value = Crypt::decrypt($value);
} catch (DecryptException $e) {
Log::debug(sprintf('Could not decrypt. %s', $e->getMessage()));
}
return $value;
}
} }