Skip to content

Prefer to use config settings in application code over env() calls due to Laravel configuration caching. #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeremykenedy merged 2 commits into from
May 21, 2018
Merged

Prefer to use config settings in application code over env() calls due to Laravel configuration caching. #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1c2fae
Prefer to use config settings in application code over `env()` calls …
kentdahl May 21, 2018
f916cc6
code style fix; spacing
kentdahl May 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Http/Controllers/UsersManagementController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public function __construct()
*/
public function index()
{
$users = User::paginate(env('USER_LIST_PAGINATION_SIZE'));
$users = User::paginate(config('settings.userListPaginationSize'));
$roles = Role::all();

return View('usersmanagement.show-users', compact('users', 'roles'));
Expand Down
2 changes: 1 addition & 1 deletion app/Traits/CaptchaTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public function captchaCheck()
{
$response = Input::get('g-recaptcha-response');
$remoteip = $_SERVER['REMOTE_ADDR'];
$secret = env('RE_CAP_SECRET');
$secret = config('settings.reCaptchSecret');

$recaptcha = new ReCaptcha($secret);
$resp = $recaptcha->verify($response, $remoteip);
Expand Down
20 changes: 20 additions & 0 deletions config/settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@
*/
'restoreUserCutoff' => env('USER_RESTORE_CUTOFF_DAYS', 31),

/*
* User list pagination size
*/
'userListPaginationSize' => env('USER_LIST_PAGINATION_SIZE', 50),

/*
* User restore encryption key
*/
Expand All @@ -42,9 +47,24 @@
*/
'reCaptchStatus' => env('ENABLE_RECAPTCHA', false),

/*
* ReCaptcha Site Key
*/
'reCaptchSite' => env('RE_CAP_SITE', 'YOURGOOGLECAPTCHAsitekeyHERE'),

/*
* ReCaptcha Secret
*/
'reCaptchSecret' => env('RE_CAP_SECRET', 'YOURGOOGLECAPTCHAsecretHERE'),

/*
* Google Maps API V3 Status
*/
'googleMapsAPIStatus' => env('GOOGLEMAPS_API_STATUS', false),

/*
* Google Maps API Key
*/
'googleMapsAPIKey' => env('GOOGLEMAPS_API_KEY', 'YOURGOOGLEMAPSkeyHERE'),

];
2 changes: 1 addition & 1 deletion resources/views/auth/register.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
@if(config('settings.reCaptchStatus'))
<div class="form-group">
<div class="col-sm-6 col-sm-offset-4">
<div class="g-recaptcha" data-sitekey="{{ env('RE_CAP_SITE') }}"></div>
<div class="g-recaptcha" data-sitekey="{{ config('settings.reCaptchSite') }}"></div>
</div>
</div>
@endif
Expand Down
2 changes: 1 addition & 1 deletion resources/views/layouts/app.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<script src="{{ mix('/js/app.js') }}"></script>

@if(config('settings.googleMapsAPIStatus'))
{!! HTML::script('//maps.googleapis.com/maps/api/js?key='.env("GOOGLEMAPS_API_KEY").'&libraries=places&dummy=.js', array('type' => 'text/javascript')) !!}
{!! HTML::script('//maps.googleapis.com/maps/api/js?key='.config("settings.googleMapsAPIKey").'&libraries=places&dummy=.js', array('type' => 'text/javascript')) !!}
@endif

@yield('footer_scripts')
Expand Down