mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-03 19:16:51 +00:00
Cleaning up [skip ci]
This commit is contained in:
@@ -120,12 +120,7 @@ class FireflyValidator extends Validator
|
|||||||
|
|
||||||
$user = User::find($this->data['user_id']);
|
$user = User::find($this->data['user_id']);
|
||||||
$type = AccountType::find($this->data['account_type_id'])->first();
|
$type = AccountType::find($this->data['account_type_id'])->first();
|
||||||
$value = $this->data['name'];
|
$value = $this->tryDecrypt($this->data['name']);
|
||||||
|
|
||||||
// decrypt if necessary
|
|
||||||
if (intval($this->data['encrypted']) === 1) {
|
|
||||||
$value = Crypt::decrypt($this->data['name']);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
$set = $user->accounts()->where('account_type_id', $type->id)->get();
|
$set = $user->accounts()->where('account_type_id', $type->id)->get();
|
||||||
@@ -139,6 +134,22 @@ class FireflyValidator extends Validator
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param $value
|
||||||
|
*
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
protected function tryDecrypt($value)
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
$value = Crypt::decrypt($value);
|
||||||
|
} catch (DecryptException $e) {
|
||||||
|
// do not care.
|
||||||
|
}
|
||||||
|
|
||||||
|
return $value;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $value
|
* @param $value
|
||||||
* @param $parameters
|
* @param $parameters
|
||||||
@@ -172,11 +183,7 @@ class FireflyValidator extends Validator
|
|||||||
{
|
{
|
||||||
$type = AccountType::find($this->data['account_type_id'])->first();
|
$type = AccountType::find($this->data['account_type_id'])->first();
|
||||||
$ignore = isset($parameters[0]) ? intval($parameters[0]) : 0;
|
$ignore = isset($parameters[0]) ? intval($parameters[0]) : 0;
|
||||||
|
$value = $this->tryDecrypt($value);
|
||||||
// if is encrypted, decrypt:
|
|
||||||
if (intval($this->data['encrypted']) === 1) {
|
|
||||||
$value = Crypt::decrypt($value);
|
|
||||||
}
|
|
||||||
|
|
||||||
$set = Auth::user()->accounts()->where('account_type_id', $type->id)->where('id', '!=', $ignore)->get();
|
$set = Auth::user()->accounts()->where('account_type_id', $type->id)->where('id', '!=', $ignore)->get();
|
||||||
/** @var Account $entry */
|
/** @var Account $entry */
|
||||||
@@ -228,13 +235,7 @@ class FireflyValidator extends Validator
|
|||||||
*/
|
*/
|
||||||
public function validateUniqueObjectForUser($attribute, $value, $parameters)
|
public function validateUniqueObjectForUser($attribute, $value, $parameters)
|
||||||
{
|
{
|
||||||
// try to decrypt value. if it fails, not a problem:
|
$value = $this->tryDecrypt($value);
|
||||||
try {
|
|
||||||
$value = Crypt::decrypt($value);
|
|
||||||
} catch (DecryptException $e) {
|
|
||||||
// do not care.
|
|
||||||
}
|
|
||||||
|
|
||||||
// exclude?
|
// exclude?
|
||||||
$table = $parameters[0];
|
$table = $parameters[0];
|
||||||
$field = $parameters[1];
|
$field = $parameters[1];
|
||||||
@@ -244,13 +245,7 @@ class FireflyValidator extends Validator
|
|||||||
$set = DB::table($table)->where('user_id', Auth::user()->id)->where('id', '!=', $exclude)->get([$field]);
|
$set = DB::table($table)->where('user_id', Auth::user()->id)->where('id', '!=', $exclude)->get([$field]);
|
||||||
|
|
||||||
foreach ($set as $entry) {
|
foreach ($set as $entry) {
|
||||||
$fieldValue = $entry->$field;
|
$fieldValue = $this->tryDecrypt($entry->$field);
|
||||||
// try to decrypt:
|
|
||||||
try {
|
|
||||||
$fieldValue = Crypt::decrypt($entry->$field);
|
|
||||||
} catch (DecryptException $e) {
|
|
||||||
// dont care
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($fieldValue === $value) {
|
if ($fieldValue === $value) {
|
||||||
return false;
|
return false;
|
||||||
@@ -279,9 +274,8 @@ class FireflyValidator extends Validator
|
|||||||
$set = $query->get(['piggy_banks.*']);
|
$set = $query->get(['piggy_banks.*']);
|
||||||
|
|
||||||
foreach ($set as $entry) {
|
foreach ($set as $entry) {
|
||||||
$isEncrypted = intval($entry->encrypted) == 1 ? true : false;
|
$fieldValue = $this->tryDecrypt($entry->name);
|
||||||
$checkValue = $isEncrypted ? Crypt::decrypt($entry->name) : $entry->name;
|
if ($fieldValue == $value) {
|
||||||
if ($checkValue == $value) {
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user