kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 17:33:45 +00:00
Code Issues Projects Releases Wiki Activity

Remove middleware [skip ci]

Browse Source
This commit is contained in:
James Cole
2018-05-13 09:58:21 +02:00
parent dc251c216c
commit 470b3e0973
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/Import/IndexController.php
View File

@@ -168,22 +168,22 @@ class IndexController extends Controller
$isDemoUser = $this->userRepository->hasRole(auth()->user(), 'demo');
$isDebug = (bool)config('app.debug');
foreach ($providerNames as $providerName) {
Log::debug(sprintf('Now with provider %s', $providerName));
//Log::debug(sprintf('Now with provider %s', $providerName));
// only consider enabled providers
$enabled = (bool)config(sprintf('import.enabled.%s', $providerName));
$allowedForDemo = (bool)config(sprintf('import.allowed_for_demo.%s', $providerName));
$allowedForUser = (bool)config(sprintf('import.allowed_for_user.%s', $providerName));
if ($enabled === false) {
Log::debug('Provider is not enabled. NEXT!');
//Log::debug('Provider is not enabled. NEXT!');
continue;
}
if ($isDemoUser === true && $allowedForDemo === false) {
Log::debug('User is demo and this provider is not allowed for demo user. NEXT!');
//Log::debug('User is demo and this provider is not allowed for demo user. NEXT!');
continue;
}
if ($isDemoUser === false && $allowedForUser === false && $isDebug === false) {
Log::debug('User is not demo and this provider is not allowed for such users. NEXT!');
//Log::debug('User is not demo and this provider is not allowed for such users. NEXT!');
continue;
}
@@ -194,7 +194,7 @@ class IndexController extends Controller
$class = (string)config(sprintf('import.prerequisites.%s', $providerName));
$result = false;
if ($class !== '' && class_exists($class)) {
Log::debug('Will not check prerequisites.');
//Log::debug('Will not check prerequisites.');
/** @var PrerequisitesInterface $object */
$object = app($class);
$object->setUser(auth()->user());
@@ -202,6 +202,7 @@ class IndexController extends Controller
}
$providers[$providerName]['prereq_complete'] = $result;
}
Log::debug(sprintf('Enabled providers: %s', json_encode(array_keys($providers))));
return $providers;
}