diff options
author | Roeland Jago Douma <roeland@famdouma.nl> | 2016-08-29 14:55:23 +0200 |
---|---|---|
committer | Roeland Jago Douma <roeland@famdouma.nl> | 2016-08-30 09:00:16 +0200 |
commit | 14136295b7568c6e34504c101eba0ee10f5c74fd (patch) | |
tree | 8fa8c31163b4a4fc8621919f330f22e5631af385 /lib/private/AvatarManager.php | |
parent | c481210e2b24706f4cb0159bd82eb16ec58d9e92 (diff) | |
download | nextcloud-server-14136295b7568c6e34504c101eba0ee10f5c74fd.tar.gz nextcloud-server-14136295b7568c6e34504c101eba0ee10f5c74fd.zip |
Cache avatars properly
* Set proper caching headers for avatars (15 minutes)
* For our own avatar use some extra logic to invalidate when we update
Diffstat (limited to 'lib/private/AvatarManager.php')
-rw-r--r-- | lib/private/AvatarManager.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/private/AvatarManager.php b/lib/private/AvatarManager.php index e461a70608b..0eabc3a1754 100644 --- a/lib/private/AvatarManager.php +++ b/lib/private/AvatarManager.php @@ -30,6 +30,7 @@ namespace OC; use OCP\Files\Folder; use OCP\Files\NotFoundException; use OCP\IAvatarManager; +use OCP\IConfig; use OCP\ILogger; use OCP\IUserManager; use OCP\Files\IRootFolder; @@ -52,6 +53,9 @@ class AvatarManager implements IAvatarManager { /** @var ILogger */ private $logger; + /** @var IConfig */ + private $config; + /** * AvatarManager constructor. * @@ -59,16 +63,19 @@ class AvatarManager implements IAvatarManager { * @param IRootFolder $rootFolder * @param IL10N $l * @param ILogger $logger + * @param IConfig $config */ public function __construct( IUserManager $userManager, IRootFolder $rootFolder, IL10N $l, - ILogger $logger) { + ILogger $logger, + IConfig $config) { $this->userManager = $userManager; $this->rootFolder = $rootFolder; $this->l = $l; $this->logger = $logger; + $this->config = $config; } /** @@ -94,6 +101,6 @@ class AvatarManager implements IAvatarManager { /** @var Folder $folder */ $folder = $this->rootFolder->get($dir); - return new Avatar($folder, $this->l, $user, $this->logger); + return new Avatar($folder, $this->l, $user, $this->logger, $this->config); } } |