Merge pull request jeremykenedy#153 from rubendahl/config-settings-preferred-over-env

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

Author: jeremykenedy

app/Http/Controllers/UsersManagementController.php

@@ -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'));

app/Traits/CaptchaTrait.php

@@ -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);

config/settings.php

@@ -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
      */
@@ -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'),
+
 ];

resources/views/auth/register.blade.php

@@ -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

resources/views/layouts/app.blade.php

@@ -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')