mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-22 14:31:26 +00:00
Update config() to config_cache()
This commit is contained in:
parent
7873b7ecc5
commit
f4fc8347c9
3 changed files with 37 additions and 37 deletions
|
@ -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;
|
||||||
|
@ -193,4 +193,4 @@ trait HomeSettings
|
||||||
return view('settings.avatar');
|
return view('settings.avatar');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -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,14 +20,14 @@
|
||||||
<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>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
<a class="text-dark font-weight-bold" data-toggle="collapse" href="#collapse2" role="button" aria-expanded="false" aria-controls="collapse2">
|
<a class="text-dark font-weight-bold" data-toggle="collapse" href="#collapse2" role="button" aria-expanded="false" aria-controls="collapse2">
|
||||||
<i class="fas fa-chevron-down mr-2"></i>
|
<i class="fas fa-chevron-down mr-2"></i>
|
||||||
How to I update profile info like name, bio, email?
|
How to I update profile info like name, bio, email?
|
||||||
|
@ -38,7 +38,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
<a class="text-dark font-weight-bold" data-toggle="collapse" href="#collapse3" role="button" aria-expanded="false" aria-controls="collapse3">
|
<a class="text-dark font-weight-bold" data-toggle="collapse" href="#collapse3" role="button" aria-expanded="false" aria-controls="collapse3">
|
||||||
<i class="fas fa-chevron-down mr-2"></i>
|
<i class="fas fa-chevron-down mr-2"></i>
|
||||||
What can I do if a username I want is taken but seems inactive?
|
What can I do if a username I want is taken but seems inactive?
|
||||||
|
@ -49,18 +49,18 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
<a class="text-dark font-weight-bold" data-toggle="collapse" href="#collapse4" role="button" aria-expanded="false" aria-controls="collapse4">
|
<a class="text-dark font-weight-bold" data-toggle="collapse" href="#collapse4" role="button" aria-expanded="false" aria-controls="collapse4">
|
||||||
<i class="fas fa-chevron-down mr-2"></i>
|
<i class="fas fa-chevron-down mr-2"></i>
|
||||||
Why can't I change my username?
|
Why can't I change my username?
|
||||||
</a>
|
</a>
|
||||||
<div class="collapse" id="collapse4">
|
<div class="collapse" id="collapse4">
|
||||||
<div class="mt-2">
|
<div class="mt-2">
|
||||||
Pixelfed is a federated application, changing your username is not supported in every <a href="https://en.wikipedia.org/wiki/ActivityPub">federated software</a> so we cannot allow username changes. Your best option is to create a new account with your desired username.
|
Pixelfed is a federated application, changing your username is not supported in every <a href="https://en.wikipedia.org/wiki/ActivityPub">federated software</a> so we cannot allow username changes. Your best option is to create a new account with your desired username.
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
<a class="text-dark font-weight-bold" data-toggle="collapse" href="#collapse5" role="button" aria-expanded="false" aria-controls="collapse5">
|
<a class="text-dark font-weight-bold" data-toggle="collapse" href="#collapse5" role="button" aria-expanded="false" aria-controls="collapse5">
|
||||||
<i class="fas fa-chevron-down mr-2"></i>
|
<i class="fas fa-chevron-down mr-2"></i>
|
||||||
I received an email that I created an account, but I never signed up for one.
|
I received an email that I created an account, but I never signed up for one.
|
||||||
|
@ -71,7 +71,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
<a class="text-dark font-weight-bold" data-toggle="collapse" href="#collapse6" role="button" aria-expanded="false" aria-controls="collapse6">
|
<a class="text-dark font-weight-bold" data-toggle="collapse" href="#collapse6" role="button" aria-expanded="false" aria-controls="collapse6">
|
||||||
<i class="fas fa-chevron-down mr-2"></i>
|
<i class="fas fa-chevron-down mr-2"></i>
|
||||||
I can't create a new account because an account with this email already exists.
|
I can't create a new account because an account with this email already exists.
|
||||||
|
@ -83,4 +83,4 @@
|
||||||
</div>
|
</div>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
@endsection
|
@endsection
|
||||||
|
|
Loading…
Reference in a new issue