mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-03 23:17:43 +02:00
Code Issues Releases Wiki Activity

Roughly implement change password/email, delete account modals

Browse Source
This commit is contained in:
Toby Zerner
2015-05-26 18:03:02 +09:30
parent 5a266ed305
commit b6be2cddab
7 changed files with 123 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/src/Core/CoreServiceProvider.php
View File

@@ -214,7 +214,7 @@ class CoreServiceProvider extends ServiceProvider
});
// Allow a user to edit their own account.
User::grantPermission('edit', function ($grant, $user) {
User::grantPermission(['edit', 'delete'], function ($grant, $user) {
$grant->where('id', $user->id);
});

4
framework/core/src/Core/Handlers/Events/EmailConfirmationMailer.php
View File

@@ -38,9 +38,9 @@ class EmailConfirmationMailer
'url' => route('flarum.forum.confirm', ['id' => $user->id, 'token' => $user->confirmation_token])
];
$this->mailer->send(['text' => 'flarum::emails.confirm'], $data, function ($message) use ($user, $forumTitle) {
$this->mailer->send(['text' => 'flarum::emails.confirm'], $data, function ($message) use ($user) {
$message->to($user->email);
$message->subject('['.$forumTitle.'] Email Address Confirmation');
$message->subject('Email Address Confirmation');
});
}

5
framework/core/src/Forum/Middleware/LoginWithCookie.php
View File

@@ -17,8 +17,9 @@ class LoginWithCookie
public function handle($request, Closure $next)
{
if (($token = $request->cookie('flarum_remember')) &&
($accessToken = AccessToken::where('id', $token)->first())) {
$this->actor->setUser($user = $accessToken->user);
($accessToken = AccessToken::where('id', $token)->first()) &&
($user = $accessToken->user)) {
$this->actor->setUser($user);
$user->updateLastSeen()->save();
}