diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/application.php | 6 | ||||
| -rw-r--r-- | core/avatar/avatarcontroller.php | 27 |
2 files changed, 20 insertions, 13 deletions
diff --git a/core/application.php b/core/application.php index 12ec6b63fd4..eab2c686dc1 100644 --- a/core/application.php +++ b/core/application.php @@ -85,7 +85,8 @@ class Application extends App { $c->query('L10N'), $c->query('UserManager'), $c->query('UserSession'), - $c->query('UserFolder') + $c->query('UserFolder'), + $c->query('Logger') ); }); @@ -128,6 +129,9 @@ class Application extends App { $container->registerService('Mailer', function(SimpleContainer $c) { return $c->query('ServerContainer')->getMailer(); }); + $container->registerService('Logger', function(SimpleContainer $c) { + return $c->query('ServerContainer')->getLogger(); + }); $container->registerService('TimeFactory', function(SimpleContainer $c) { return new TimeFactory(); }); diff --git a/core/avatar/avatarcontroller.php b/core/avatar/avatarcontroller.php index 97b3615c032..e15b47e9a84 100644 --- a/core/avatar/avatarcontroller.php +++ b/core/avatar/avatarcontroller.php @@ -30,7 +30,7 @@ use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\DataDisplayResponse; use OCP\IAvatarManager; -use OCP\ICache; +use OCP\ILogger; use OCP\IL10N; use OCP\IRequest; use OCP\IUserManager; @@ -62,6 +62,9 @@ class AvatarController extends Controller { /** @var Folder */ protected $userFolder; + /** @var ILogger */ + protected $logger; + /** * @param string $appName * @param IRequest $request @@ -71,6 +74,7 @@ class AvatarController extends Controller { * @param IUserManager $userManager * @param IUserSession $userSession * @param Folder $userFolder + * @param ILogger $logger */ public function __construct($appName, IRequest $request, @@ -79,7 +83,8 @@ class AvatarController extends Controller { IL10N $l10n, IUserManager $userManager, IUserSession $userSession, - Folder $userFolder) { + Folder $userFolder, + ILogger $logger) { parent::__construct($appName, $request); $this->avatarManager = $avatarManager; @@ -88,6 +93,7 @@ class AvatarController extends Controller { $this->userManager = $userManager; $this->userSession = $userSession; $this->userFolder = $userFolder; + $this->logger = $logger; } /** @@ -218,11 +224,8 @@ class AvatarController extends Controller { ); } } catch (\Exception $e) { - return new DataResponse( - ['data' => ['message' => $e->getMessage()]], - Http::STATUS_OK, - $headers - ); + $this->logger->logException($e, ['app' => 'core']); + return new DataResponse(['data' => ['message' => $this->l->t('An error occurred. Please contact your admin.')]], Http::STATUS_OK, $headers); } } @@ -239,7 +242,8 @@ class AvatarController extends Controller { $avatar->remove(); return new DataResponse(); } catch (\Exception $e) { - return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_BAD_REQUEST); + $this->logger->logException($e, ['app' => 'core']); + return new DataResponse(['data' => ['message' => $this->l->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST); } } @@ -307,10 +311,9 @@ class AvatarController extends Controller { } catch (\OC\NotSquareException $e) { return new DataResponse(['data' => ['message' => $this->l->t('Crop is not square')]], Http::STATUS_BAD_REQUEST); - - }catch (\Exception $e) { - return new DataResponse(['data' => ['message' => $e->getMessage()]], - Http::STATUS_BAD_REQUEST); + } catch (\Exception $e) { + $this->logger->logException($e, ['app' => 'core']); + return new DataResponse(['data' => ['message' => $this->l->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST); } } } |