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

Learned that I should not refer to env vars directly so I removed all references.

Browse Source
This commit is contained in:
James Cole
2018-12-15 07:59:02 +01:00
parent 4bd94e5450
commit c54541b839
116 changed files with 239 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Admin/ConfigurationController.php
View File

@@ -68,7 +68,7 @@ class ConfigurationController extends Controller
// they don't exist yet.
$singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
$isDemoSite = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
$siteOwner = env('SITE_OWNER');
$siteOwner = config('firefly.site_owner');
return view(
'admin.configuration.index',

5
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@@ -59,7 +59,8 @@ class ForgotPasswordController extends Controller
*/
public function sendResetLinkEmail(Request $request, UserRepositoryInterface $repository)
{
$loginProvider = envNonEmpty('LOGIN_PROVIDER','eloquent');
Log::info('Start of sendResetLinkEmail()');
$loginProvider = config('firefly.login_provider');
if ('eloquent' !== $loginProvider) {
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
Log::error($message);
@@ -98,7 +99,7 @@ class ForgotPasswordController extends Controller
*/
public function showLinkRequestForm()
{
$loginProvider = envNonEmpty('LOGIN_PROVIDER','eloquent');
$loginProvider = config('firefly.login_provider');
if ('eloquent' !== $loginProvider) {
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);

2
app/Http/Controllers/Auth/LoginController.php
View File

@@ -130,7 +130,7 @@ class LoginController extends Controller
public function showLoginForm(Request $request)
{
$count = DB::table('users')->count();
$loginProvider = envNonEmpty('LOGIN_PROVIDER', 'eloquent');
$loginProvider = config('firefly.login_provider');
$pageTitle = (string)trans('firefly.login_page_title');
if (0 === $count && 'eloquent' === $loginProvider) {
return redirect(route('register')); // @codeCoverageIgnore

4
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -72,7 +72,7 @@ class RegisterController extends Controller
{
// is allowed to?
$allowRegistration = true;
$loginProvider = envNonEmpty('LOGIN_PROVIDER', 'eloquent');
$loginProvider = config('firefly.login_provider');
$singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
$userCount = User::count();
if (true === $singleUserMode && $userCount > 0 && 'eloquent' === $loginProvider) {
@@ -113,7 +113,7 @@ class RegisterController extends Controller
public function showRegistrationForm(Request $request)
{
$allowRegistration = true;
$loginProvider = envNonEmpty('LOGIN_PROVIDER', 'eloquent');
$loginProvider = config('firefly.login_provider');
$isDemoSite = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
$singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
$userCount = User::count();

4
app/Http/Controllers/Auth/ResetPasswordController.php
View File

@@ -71,7 +71,7 @@ class ResetPasswordController extends Controller
*/
public function showResetForm(Request $request, $token = null)
{
$loginProvider = envNonEmpty('LOGIN_PROVIDER','eloquent');
$loginProvider = config('firefly.login_provider');
if ('eloquent' !== $loginProvider) {
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
@@ -103,7 +103,7 @@ class ResetPasswordController extends Controller
*/
public function reset(Request $request)
{
$loginProvider = envNonEmpty('LOGIN_PROVIDER','eloquent');
$loginProvider = config('firefly.login_provider');
if ('eloquent' !== $loginProvider) {
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);

2
app/Http/Controllers/Auth/TwoFactorController.php
View File

@@ -77,7 +77,7 @@ class TwoFactorController extends Controller
{
/** @var User $user */
$user = auth()->user();
$siteOwner = env('SITE_OWNER', '');
$siteOwner = config('firefly.site_owner');
$title = (string)trans('firefly.two_factor_forgot_title');
Log::info(

4
app/Http/Controllers/Controller.php
View File

@@ -63,8 +63,8 @@ class Controller extends BaseController
// is site a demo site?
$isDemoSite = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
app('view')->share('IS_DEMO_SITE', $isDemoSite);
app('view')->share('DEMO_USERNAME', env('DEMO_USERNAME', ''));
app('view')->share('DEMO_PASSWORD', env('DEMO_PASSWORD', ''));
app('view')->share('DEMO_USERNAME', config('firefly.demo_username'));
app('view')->share('DEMO_PASSWORD', config('firefly.demo_password'));
app('view')->share('FF_VERSION', config('firefly.version'));
$this->middleware(

14
app/Http/Controllers/CurrencyController.php
View File

@@ -77,7 +77,7 @@ class CurrencyController extends Controller
/** @var User $user */
$user = auth()->user();
if (!$this->userRepository->hasRole($user, 'owner')) {
$request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
$request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => config('firefly.site_owner')]));
return redirect(route('currencies.index'));
}
@@ -127,7 +127,7 @@ class CurrencyController extends Controller
$user = auth()->user();
if (!$this->userRepository->hasRole($user, 'owner')) {
// @codeCoverageIgnoreStart
$request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
$request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => config('firefly.site_owner')]));
return redirect(route('currencies.index'));
// @codeCoverageIgnoreEnd
@@ -160,7 +160,7 @@ class CurrencyController extends Controller
$user = auth()->user();
if (!$this->userRepository->hasRole($user, 'owner')) {
// @codeCoverageIgnoreStart
$request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
$request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => config('firefly.site_owner')]));
return redirect(route('currencies.index'));
// @codeCoverageIgnoreEnd
@@ -192,7 +192,7 @@ class CurrencyController extends Controller
$user = auth()->user();
if (!$this->userRepository->hasRole($user, 'owner')) {
// @codeCoverageIgnoreStart
$request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
$request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => config('firefly.site_owner')]));
return redirect(route('currencies.index'));
// @codeCoverageIgnoreEnd
@@ -236,7 +236,7 @@ class CurrencyController extends Controller
$user = auth()->user();
if (!$this->userRepository->hasRole($user, 'owner')) {
// @codeCoverageIgnoreStart
$request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
$request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => config('firefly.site_owner')]));
return redirect(route('currencies.index'));
// @codeCoverageIgnoreEnd
@@ -308,7 +308,7 @@ class CurrencyController extends Controller
$defaultCurrency = $this->repository->getCurrencyByPreference(app('preferences')->get('currencyPreference', config('firefly.default_currency', 'EUR')));
$isOwner = true;
if (!$this->userRepository->hasRole($user, 'owner')) {
$request->session()->flash('info', (string)trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
$request->session()->flash('info', (string)trans('firefly.ask_site_owner', ['owner' => config('firefly.site_owner')]));
$isOwner = false;
}
@@ -374,7 +374,7 @@ class CurrencyController extends Controller
$user = auth()->user();
if (!$this->userRepository->hasRole($user, 'owner')) {
// @codeCoverageIgnoreStart
$request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => env('SITE_OWNER')]));
$request->session()->flash('error', (string)trans('firefly.ask_site_owner', ['owner' => config('firefly.site_owner')]));
return redirect(route('currencies.index'));
// @codeCoverageIgnoreEnd

24
app/Http/Controllers/DebugController.php
View File

@@ -128,19 +128,19 @@ class DebugController extends Controller
$drivers = implode(', ', DB::availableDrivers());
$currentDriver = DB::getDriverName();
$userAgent = $request->header('user-agent');
$isSandstorm = var_export(env('IS_SANDSTORM', 'unknown'), true);
$isDocker = var_export(env('IS_DOCKER', 'unknown'), true);
$toSandbox = var_export(env('BUNQ_USE_SANDBOX', 'unknown'), true);
$trustedProxies = env('TRUSTED_PROXIES', '(none)');
$isSandstorm = var_export(config('firefly.is_sandstorm'), true);
$isDocker = var_export(config('firefly.is_docker'), true);
$toSandbox = var_export(config('firefly.bunq_use_sandbox'), true);
$trustedProxies = config('firefly.trusted_proxies');
$displayErrors = ini_get('display_errors');
$storageDisks = implode(', ', config('filesystems.disks.upload.disks'));
$storageDisks = implode(', ', config('filesystems.disks.upload.disks'));
$errorReporting = $this->errorReporting((int)ini_get('error_reporting'));
$appEnv = env('APP_ENV', '');
$appDebug = var_export(env('APP_DEBUG', false), true);
$logChannel = env('LOG_CHANNEL', '');
$appLogLevel = env('APP_LOG_LEVEL', 'info');
$cacheDriver = env('CACHE_DRIVER', 'unknown');
$loginProvider = env('LOGIN_PROVIDER', 'unknown');
$appEnv = config('app.env');
$appDebug = var_export(config('app.debug'), true);
$logChannel = config('logging.default');
$appLogLevel = config('logging.level');
$cacheDriver = config('cache.default');
$loginProvider = config('auth.driver');
// set languages, see what happens:
$original = setlocale(LC_ALL, 0);
@@ -179,7 +179,7 @@ class DebugController extends Controller
return view(
'debug', compact(
'phpVersion', 'extensions', 'localeAttempts', 'appEnv', 'appDebug', 'logChannel', 'appLogLevel', 'now', 'drivers',
'currentDriver', 'loginProvider','storageDisks',
'currentDriver', 'loginProvider', 'storageDisks',
'userAgent', 'displayErrors', 'errorReporting', 'phpOs', 'interface', 'logContent', 'cacheDriver', 'isDocker', 'isSandstorm',
'trustedProxies',
'toSandbox'

2
app/Http/Controllers/SearchController.php
View File

@@ -96,7 +96,7 @@ class SearchController extends Controller
if (!$cache->has()) {
// parse search terms:
$searcher->parseQuery($fullQuery);
$searcher->setLimit((int)env('SEARCH_RESULT_LIMIT', 50));
$searcher->setLimit((int)config('firefly.search_result_limit'));
$transactions = $searcher->searchTransactions();
$cache->store($transactions);
}