Update config() to config_cache()

pull/2753/head
Daniel Supernault 4 years ago
parent 7873b7ecc5
commit f4fc8347c9
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7

@ -55,7 +55,7 @@ trait HomeSettings
$layout = !in_array($layout, ['metro', 'moment']) ? 'metro' : $layout; $layout = !in_array($layout, ['metro', 'moment']) ? 'metro' : $layout;
} }
$enforceEmailVerification = config('pixelfed.enforce_email_verification'); $enforceEmailVerification = config_cache('pixelfed.enforce_email_verification');
// Only allow email to be updated if not yet verified // Only allow email to be updated if not yet verified
if (!$enforceEmailVerification || !$changes && $user->email_verified_at) { if (!$enforceEmailVerification || !$changes && $user->email_verified_at) {
@ -152,7 +152,7 @@ trait HomeSettings
$user = Auth::user(); $user = Auth::user();
$profile = $user->profile; $profile = $user->profile;
$validate = config('pixelfed.enforce_email_verification'); $validate = config_cache('pixelfed.enforce_email_verification');
if ($user->email != $email) { if ($user->email != $email) {
$changes = true; $changes = true;

@ -6,31 +6,31 @@ use Closure;
class EmailVerificationCheck class EmailVerificationCheck
{ {
/** /**
* Handle an incoming request. * Handle an incoming request.
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
* @param \Closure $next * @param \Closure $next
* *
* @return mixed * @return mixed
*/ */
public function handle($request, Closure $next) public function handle($request, Closure $next)
{ {
if ($request->user() && if ($request->user() &&
config('pixelfed.enforce_email_verification') && config_cache('pixelfed.enforce_email_verification') &&
is_null($request->user()->email_verified_at) && is_null($request->user()->email_verified_at) &&
!$request->is( !$request->is(
'i/auth/*', 'i/auth/*',
'i/verify-email', 'i/verify-email',
'log*', 'log*',
'i/confirm-email/*', 'i/confirm-email/*',
'settings/home', 'settings/home',
'settings/email' 'settings/email'
) )
) { ) {
return redirect('/i/verify-email'); return redirect('/i/verify-email');
} }
return $next($request); return $next($request);
} }
} }

@ -20,7 +20,7 @@
<li>Go to <a href="{{config('app.url')}}">{{config('app.url')}}</a>.</li> <li>Go to <a href="{{config('app.url')}}">{{config('app.url')}}</a>.</li>
<li>Click on the register link at the top of the page.</li> <li>Click on the register link at the top of the page.</li>
<li>Enter your name, email address, username and password.</li> <li>Enter your name, email address, username and password.</li>
@if(config('pixelfed.enforce_email_verification') != true) @if(config_cache('pixelfed.enforce_email_verification') != true)
<li>Wait for an account verification email, it may take a few minutes.</li> <li>Wait for an account verification email, it may take a few minutes.</li>
@endif @endif
</ol> </ol>

Loading…
Cancel
Save