gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-09 20:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code clean up

Browse Source
This commit is contained in:
James Cole
2016-09-16 12:15:58 +02:00
parent f38984398d
commit d25d0454fc
52 changed files with 135 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Validation/FireflyValidator.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Validation;
use Auth;
use Config;
use Crypt;
use DB;
@@ -85,7 +84,7 @@ class FireflyValidator extends Validator
if (intval($value) === 0) {
return true;
}
$count = DB::table($parameters[0])->where('user_id', Auth::user()->id)->where($field, $value)->count();
$count = DB::table($parameters[0])->where('user_id', auth()->user()->id)->where($field, $value)->count();
if ($count === 1) {
return true;
}
@@ -256,7 +255,7 @@ class FireflyValidator extends Validator
$query = AccountMeta::
leftJoin('accounts', 'accounts.id', '=', 'account_meta.account_id')
->where('accounts.user_id', Auth::user()->id)
->where('accounts.user_id', auth()->user()->id)
->where('account_meta.name', 'accountNumber');
if (intval($accountId) > 0) {
@@ -288,7 +287,7 @@ class FireflyValidator extends Validator
public function validateUniqueForUser($attribute, $value, $parameters): bool
{
$query = DB::table($parameters[0])->where($parameters[1], $value);
$query->where('user_id', Auth::user()->id);
$query->where('user_id', auth()->user()->id);
if (isset($parameters[2])) {
$query->where('id', '!=', $parameters[2]);
}
@@ -324,7 +323,7 @@ class FireflyValidator extends Validator
$exclude = $parameters[2] ?? 0;
// get entries from table
$set = DB::table($table)->where('user_id', Auth::user()->id)
$set = DB::table($table)->where('user_id', auth()->user()->id)
->where('id', '!=', $exclude)->get([$field]);
foreach ($set as $entry) {
@@ -349,7 +348,7 @@ class FireflyValidator extends Validator
{
$exclude = $parameters[0] ?? null;
$query = DB::table('piggy_banks')->whereNull('piggy_banks.deleted_at')
->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')->where('accounts.user_id', Auth::user()->id);
->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')->where('accounts.user_id', auth()->user()->id);
if (!is_null($exclude)) {
$query->where('piggy_banks.id', '!=', $exclude);
}
@@ -444,7 +443,7 @@ class FireflyValidator extends Validator
$ignore = $existingAccount->id;
$value = $this->tryDecrypt($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 */
foreach ($set as $entry) {
if ($entry->name == $value) {
@@ -468,7 +467,7 @@ class FireflyValidator extends Validator
$ignore = $parameters[0] ?? 0;
$value = $this->tryDecrypt($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 */
foreach ($set as $entry) {
if ($entry->name == $value) {
@@ -492,7 +491,7 @@ class FireflyValidator extends Validator
$type = AccountType::whereType($search)->first();
$ignore = $parameters[0] ?? 0;
$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 */
foreach ($set as $entry) {
if ($entry->name == $value) {