UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-09-20 00:08:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update SettingsController, fix bug that prevented instances without email validation to update settings

Browse source
This commit is contained in:
Daniel Supernault 2018-08-20 20:33:07 -06:00
parent 7e78f63ff5
commit bde671657f
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Controllers/SettingsController.php
View file

@ -44,29 +44,33 @@ class SettingsController extends Controller
$user = Auth::user(); $user = Auth::user();
$profile = $user->profile; $profile = $user->profile;
$validate = config('pixelfed.enforce_email_verification');
if($user->email != $email) { if($user->email != $email) {
$changes = true; $changes = true;
$user->email = $email; $user->email = $email;
if($validate) {
$user->email_verified_at = null; $user->email_verified_at = null;
// Prevent old verifications from working // Prevent old verifications from working
EmailVerification::whereUserId($user->id)->delete(); EmailVerification::whereUserId($user->id)->delete();
} }
}
// Only allow email to be updated if not yet verified // Only allow email to be updated if not yet verified
if(!$changes && $user->email_verified_at) { if(!$validate || !$changes && $user->email_verified_at) {
if($profile->name != $name) { if($profile->name != $name) {
$changes = true; $changes = true;
$user->name = $name; $user->name = $name;
$profile->name = $name; $profile->name = $name;
} }
if($profile->website != $website) { if(!$profile->website || $profile->website != $website) {
$changes = true; $changes = true;
$profile->website = $website; $profile->website = $website;
} }
if($profile->bio != $bio) { if(!$profile->bio || !$profile->bio != $bio) {
$changes = true; $changes = true;
$profile->bio = $bio; $profile->bio = $bio;
} }