Try decrypt routine [skip ci]

This commit is contained in:
James Cole 2017-10-30 17:39:25 +01:00
parent 7a50bf29ee
commit 2c9ee43961
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E

View File

@ -28,6 +28,7 @@ use Carbon\Carbon;
use Exception; use Exception;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use Illuminate\Support\Str;
use Log; use Log;
use Steam; use Steam;
@ -61,31 +62,29 @@ class Modifier
*/ */
public static function apply(array $modifier, Transaction $transaction): bool public static function apply(array $modifier, Transaction $transaction): bool
{ {
$res = true; $res = true;
switch ($modifier['type']) { switch ($modifier['type']) {
case 'source': case 'source':
$modifier['value'] = Steam::tryDecrypt($modifier['value']); $name = Steam::tryDecrypt($transaction->account_name);
$res = self::stringCompare($transaction->account_name, $modifier['value']); $res = self::stringCompare($name, $modifier['value']);
Log::debug(sprintf('Source is %s? %s', $modifier['value'], var_export($res, true))); Log::debug(sprintf('Source is %s? %s', $modifier['value'], var_export($res, true)));
break; break;
case 'destination': case 'destination':
$modifier['value'] = Steam::tryDecrypt($modifier['value']); $name = Steam::tryDecrypt($transaction->opposing_account_name);
$res = self::stringCompare($transaction->opposing_account_name, $modifier['value']); $res = self::stringCompare($name, $modifier['value']);
Log::debug(sprintf('Destination is %s? %s', $modifier['value'], var_export($res, true))); Log::debug(sprintf('Destination is %s? %s', $modifier['value'], var_export($res, true)));
break; break;
case 'category': case 'category':
$modifier['value'] = Steam::tryDecrypt($modifier['value']); $res = self::category($transaction, $modifier['value']);
$res = self::category($transaction, $modifier['value']);
Log::debug(sprintf('Category is %s? %s', $modifier['value'], var_export($res, true))); Log::debug(sprintf('Category is %s? %s', $modifier['value'], var_export($res, true)));
break; break;
case 'budget': case 'budget':
$modifier['value'] = Steam::tryDecrypt($modifier['value']); $res = self::budget($transaction, $modifier['value']);
$res = self::budget($transaction, $modifier['value']);
Log::debug(sprintf('Budget is %s? %s', $modifier['value'], var_export($res, true))); Log::debug(sprintf('Budget is %s? %s', $modifier['value'], var_export($res, true)));
break; break;
case 'bill': case 'bill':
$modifier['value'] = Steam::tryDecrypt($modifier['value']); $name = Steam::tryDecrypt($transaction->bill_name);
$res = self::stringCompare(strval($transaction->bill_name), $modifier['value']); $res = self::stringCompare($name, $modifier['value']);
Log::debug(sprintf('Bill is %s? %s', $modifier['value'], var_export($res, true))); Log::debug(sprintf('Bill is %s? %s', $modifier['value'], var_export($res, true)));
break; break;
} }