mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-26 21:21:28 +01:00
Code Issues Releases Wiki Activity

merges 5.5 and master into next-back

Browse Source
This commit is contained in:
Daniël Klabbers
2017-12-14 01:00:16 +01:00
parent 93aa3d77b5 c6ce172caa
commit f65e4dcba3
104 changed files with 1723 additions and 1828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/User/Command/DeleteAvatarHandler.php
View File

@@ -15,8 +15,9 @@ use Flarum\Foundation\DispatchEventsTrait;
use Flarum\User\AssertPermissionTrait;
use Flarum\User\Event\AvatarDeleting;
use Flarum\User\UserRepository;
use Flarum\Core\AvatarUploader;
use Flarum\Event\AvatarWillBeDeleted;
use Illuminate\Contracts\Events\Dispatcher;
use League\Flysystem\FilesystemInterface;
class DeleteAvatarHandler
{
@@ -29,20 +30,20 @@ class DeleteAvatarHandler
protected $users;
/**
* @var FilesystemInterface
* @var AvatarUploader
*/
protected $uploadDir;
protected $uploader;
/**
* @param Dispatcher $events
* @param UserRepository $users
* @param FilesystemInterface $uploadDir
* @param AvatarUploader $uploader
*/
public function __construct(Dispatcher $events, UserRepository $users, FilesystemInterface $uploadDir)
public function __construct(Dispatcher $events, UserRepository $users, AvatarUploader $uploader)
{
$this->events = $events;
$this->users = $users;
$this->uploadDir = $uploadDir;
$this->uploader = $uploader;
}
/**
@@ -60,8 +61,7 @@ class DeleteAvatarHandler
$this->assertCan($actor, 'edit', $user);
}
$avatarPath = $user->avatar_path;
$user->changeAvatarPath(null);
$this->uploader->remove($user);
$this->events->fire(
new AvatarDeleting($user, $actor)
@@ -69,10 +69,6 @@ class DeleteAvatarHandler
$user->save();
if ($this->uploadDir->has($avatarPath)) {
$this->uploadDir->delete($avatarPath);
}
$this->dispatchEventsFor($user, $actor);
return $user;

47
src/User/Command/EditUserHandler.php
View File

@@ -11,6 +11,8 @@
namespace Flarum\User\Command;
use Exception;
use Flarum\Core\AvatarUploader;
use Flarum\Foundation\DispatchEventsTrait;
use Flarum\User\AssertPermissionTrait;
use Flarum\User\Event\GroupsChanged;
@@ -19,6 +21,9 @@ use Flarum\User\User;
use Flarum\User\UserRepository;
use Flarum\User\UserValidator;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Contracts\Validation\Factory;
use Illuminate\Validation\ValidationException;
use Intervention\Image\ImageManager;
class EditUserHandler
{
@@ -35,16 +40,30 @@ class EditUserHandler
*/
protected $validator;
/**
* @var AvatarUploader
*/
protected $avatarUploader;
/**
* @var Factory
*/
private $validatorFactory;
/**
* @param Dispatcher $events
* @param \Flarum\User\UserRepository $users
* @param UserValidator $validator
* @param AvatarUploader $avatarUploader
* @param Factory $validatorFactory
*/
public function __construct(Dispatcher $events, UserRepository $users, UserValidator $validator)
public function __construct(Dispatcher $events, UserRepository $users, UserValidator $validator, AvatarUploader $avatarUploader, Factory $validatorFactory)
{
$this->events = $events;
$this->users = $users;
$this->validator = $validator;
$this->avatarUploader = $avatarUploader;
$this->validatorFactory = $validatorFactory;
}
/**
@@ -95,14 +114,6 @@ class EditUserHandler
$validate['password'] = $attributes['password'];
}
if (isset($attributes['bio'])) {
if (! $isSelf) {
$this->assertPermission($canEdit);
}
$user->changeBio($attributes['bio']);
}
if (! empty($attributes['readTime'])) {
$this->assertPermission($isSelf);
$user->markAllAsRead();
@@ -135,6 +146,24 @@ class EditUserHandler
});
}
if ($avatarUrl = array_get($attributes, 'avatarUrl')) {
$validation = $this->validatorFactory->make(compact('avatarUrl'), ['avatarUrl' => 'url']);
if ($validation->fails()) {
throw new ValidationException($validation);
}
try {
$image = (new ImageManager)->make($avatarUrl);
$this->avatarUploader->upload($user, $image);
} catch (Exception $e) {
//
}
} elseif (array_key_exists('avatarUrl', $attributes)) {
$this->avatarUploader->remove($user);
}
$this->events->fire(
new Saving($user, $actor, $data)
);

49
src/User/Command/RegisterUserHandler.php
View File

@@ -12,7 +12,7 @@
namespace Flarum\User\Command;
use Exception;
use Flarum\Foundation\Application;
use Flarum\Core\AvatarUploader;
use Flarum\Foundation\DispatchEventsTrait;
use Flarum\Settings\SettingsRepositoryInterface;
use Flarum\User\AssertPermissionTrait;
@@ -23,13 +23,8 @@ use Flarum\User\User;
use Flarum\User\UserValidator;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Contracts\Validation\Factory;
use Illuminate\Contracts\Validation\ValidationException;
use Illuminate\Support\Str;
use Illuminate\Validation\ValidationException;
use Intervention\Image\ImageManager;
use League\Flysystem\Adapter\Local;
use League\Flysystem\Filesystem;
use League\Flysystem\FilesystemInterface;
use League\Flysystem\MountManager;
class RegisterUserHandler
{
@@ -47,14 +42,9 @@ class RegisterUserHandler
protected $validator;
/**
* @var Application
* @var AvatarUploader
*/
protected $app;
/**
* @var FilesystemInterface
*/
protected $uploadDir;
protected $avatarUploader;
/**
* @var Factory
@@ -65,17 +55,15 @@ class RegisterUserHandler
* @param Dispatcher $events
* @param SettingsRepositoryInterface $settings
* @param UserValidator $validator
* @param Application $app
* @param FilesystemInterface $uploadDir
* @param AvatarUploader $avatarUploader
* @param Factory $validatorFactory
*/
public function __construct(Dispatcher $events, SettingsRepositoryInterface $settings, UserValidator $validator, Application $app, FilesystemInterface $uploadDir, Factory $validatorFactory)
public function __construct(Dispatcher $events, SettingsRepositoryInterface $settings, UserValidator $validator, AvatarUploader $avatarUploader, Factory $validatorFactory)
{
$this->events = $events;
$this->settings = $settings;
$this->validator = $validator;
$this->app = $app;
$this->uploadDir = $uploadDir;
$this->avatarUploader = $avatarUploader;
$this->validatorFactory = $validatorFactory;
}
@@ -144,7 +132,9 @@ class RegisterUserHandler
}
try {
$this->saveAvatarFromUrl($user, $avatarUrl);
$image = (new ImageManager)->make($avatarUrl);
$this->avatarUploader->upload($user, $image);
} catch (Exception $e) {
//
}
@@ -160,23 +150,4 @@ class RegisterUserHandler
return $user;
}
private function saveAvatarFromUrl(User $user, $url)
{
$tmpFile = tempnam($this->app->storagePath().'/tmp', 'avatar');
$manager = new ImageManager;
$manager->make($url)->fit(100, 100)->save($tmpFile);
$mount = new MountManager([
'source' => new Filesystem(new Local(pathinfo($tmpFile, PATHINFO_DIRNAME))),
'target' => $this->uploadDir,
]);
$uploadName = Str::lower(Str::quickRandom()).'.png';
$user->changeAvatarPath($uploadName);
$mount->move('source://'.pathinfo($tmpFile, PATHINFO_BASENAME), "target://$uploadName");
}
}

6
src/User/Command/RequestPasswordResetHandler.php
View File

@@ -18,9 +18,9 @@ use Flarum\User\UserRepository;
use Illuminate\Contracts\Mail\Mailer;
use Illuminate\Contracts\Translation\Translator;
use Illuminate\Contracts\Validation\Factory;
use Illuminate\Contracts\Validation\ValidationException;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Mail\Message;
use Illuminate\Validation\ValidationException;
class RequestPasswordResetHandler
{
@@ -55,7 +55,7 @@ class RequestPasswordResetHandler
protected $validatorFactory;
/**
* @param \Flarum\User\UserRepository $users
* @param UserRepository $users
* @param SettingsRepositoryInterface $settings
* @param Mailer $mailer
* @param UrlGenerator $url
@@ -106,7 +106,7 @@ class RequestPasswordResetHandler
$token->save();
$data = [
'{username}' => $user->username,
'{username}' => $user->display_name,
'{url}' => $this->url->to('forum')->route('resetPassword', ['token' => $token->id]),
'{forum}' => $this->settings->get('forum_title'),
];

72
src/User/Command/UploadAvatarHandler.php
View File

@@ -12,6 +12,7 @@
namespace Flarum\User\Command;
use Exception;
use Flarum\Core\AvatarUploader;
use Flarum\Foundation\Application;
use Flarum\Foundation\DispatchEventsTrait;
use Flarum\User\AssertPermissionTrait;
@@ -19,12 +20,7 @@ use Flarum\User\AvatarValidator;
use Flarum\User\Event\AvatarSaving;
use Flarum\User\UserRepository;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Support\Str;
use Intervention\Image\ImageManager;
use League\Flysystem\Adapter\Local;
use League\Flysystem\Filesystem;
use League\Flysystem\FilesystemInterface;
use League\Flysystem\MountManager;
use Symfony\Component\HttpFoundation\File\UploadedFile;
class UploadAvatarHandler
@@ -37,16 +33,16 @@ class UploadAvatarHandler
*/
protected $users;
/**
* @var FilesystemInterface
*/
protected $uploadDir;
/**
* @var Application
*/
protected $app;
/**
* @var AvatarUploader
*/
protected $uploader;
/**
* @var \Flarum\User\AvatarValidator
*/
@@ -55,16 +51,16 @@ class UploadAvatarHandler
/**
* @param Dispatcher $events
* @param UserRepository $users
* @param FilesystemInterface $uploadDir
* @param Application $app
* @param \Flarum\User\AvatarValidator $validator
* @param AvatarUploader $uploader
* @param AvatarValidator $validator
*/
public function __construct(Dispatcher $events, UserRepository $users, FilesystemInterface $uploadDir, Application $app, AvatarValidator $validator)
public function __construct(Dispatcher $events, UserRepository $users, Application $app, AvatarUploader $uploader, AvatarValidator $validator)
{
$this->events = $events;
$this->users = $users;
$this->uploadDir = $uploadDir;
$this->app = $app;
$this->uploader = $uploader;
$this->validator = $validator;
}
@@ -83,60 +79,36 @@ class UploadAvatarHandler
$this->assertCan($actor, 'edit', $user);
}
$file = $command->file;
$tmpFile = tempnam($this->app->storagePath().'/tmp', 'avatar');
$command->file->moveTo($tmpFile);
$file->moveTo($tmpFile);
try {
$file = new UploadedFile(
$tmpFile,
$command->file->getClientFilename(),
$command->file->getClientMediaType(),
$command->file->getSize(),
$command->file->getError(),
$file->getClientFilename(),
$file->getClientMediaType(),
$file->getSize(),
$file->getError(),
true
);
$this->validator->assertValid(['avatar' => $file]);
$manager = new ImageManager;
// Explicitly tell Intervention to encode the image as PNG (instead of having to guess from the extension)
// Read exif data to orientate avatar only if EXIF extension is enabled
if (extension_loaded('exif')) {
$encodedImage = $manager->make($tmpFile)->orientate()->fit(100, 100)->encode('png', 100);
} else {
$encodedImage = $manager->make($tmpFile)->fit(100, 100)->encode('png', 100);
}
file_put_contents($tmpFile, $encodedImage);
$image = (new ImageManager)->make($tmpFile);
$this->events->fire(
new AvatarSaving($user, $actor, $tmpFile)
);
$mount = new MountManager([
'source' => new Filesystem(new Local(pathinfo($tmpFile, PATHINFO_DIRNAME))),
'target' => $this->uploadDir,
]);
if ($user->avatar_path && $mount->has($file = "target://$user->avatar_path")) {
$mount->delete($file);
}
$uploadName = Str::lower(Str::quickRandom()).'.png';
$user->changeAvatarPath($uploadName);
$mount->move('source://'.pathinfo($tmpFile, PATHINFO_BASENAME), "target://$uploadName");
$this->uploader->upload($user, $image);
$user->save();
$this->dispatchEventsFor($user, $actor);
return $user;
} catch (Exception $e) {
} finally {
@unlink($tmpFile);
throw $e;
}
return $user;
}
}