github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-25 04:39:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only validate and check for suspend permission if suspendUntil attribute is present. fixes flarum/core#826

Browse Source
This commit is contained in:
Toby Zerner 2016-02-24 16:07:05 +10:30
parent f0f668938a
commit a87b51f511
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
extensions/suspend/src/Listener/SaveSuspensionToDatabase.php
View File

@ -10,8 +10,7 @@
namespace Flarum\Suspend\Listener; namespace Flarum\Suspend\Listener;
use Illuminate\Support\Arr; use DateTime;
use Carbon\Carbon;
use Flarum\Core\Access\AssertPermissionTrait; use Flarum\Core\Access\AssertPermissionTrait;
use Flarum\Event\UserWillBeSaved; use Flarum\Event\UserWillBeSaved;
use Flarum\Suspend\SuspendValidator; use Flarum\Suspend\SuspendValidator;
@ -51,18 +50,15 @@ class SaveSuspensionToDatabase
{ {
$attributes = array_get($event->data, 'attributes', []); $attributes = array_get($event->data, 'attributes', []);
$suspendUntil = Arr::get($attributes, 'suspendUntil'); if (array_key_exists('suspendUntil', $attributes)) {
if ($suspendUntil) { $this->validator->assertValid($attributes);
$suspendUntil = new Carbon($suspendUntil);
$user = $event->user;
$actor = $event->actor;
$this->assertCan($actor, 'suspend', $user);
$user->suspend_until = new DateTime($attributes['suspendUntil']);
} }
$this->validator->assertValid($attributes);
$user = $event->user;
$actor = $event->actor;
$this->assertCan($actor, 'suspend', $user);
$user->suspend_until = $suspendUntil;
} }
} }