nextcloud / server

core/Controller/AvatarController.php

Indentation +288 added lines, -288 removed lines

@@ -53,292 +53,292 @@
  */
 class AvatarController extends Controller {
 
-	/** @var IAvatarManager */
-	protected $avatarManager;
-
-	/** @var ICache */
-	protected $cache;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/** @var IRootFolder */
-	protected $rootFolder;
-
-	/** @var ILogger */
-	protected $logger;
-
-	/** @var string */
-	protected $userId;
-
-	/** @var TimeFactory */
-	protected $timeFactory;
-
-	public function __construct($appName,
-								IRequest $request,
-								IAvatarManager $avatarManager,
-								ICache $cache,
-								IL10N $l10n,
-								IUserManager $userManager,
-								IRootFolder $rootFolder,
-								ILogger $logger,
-								$userId,
-								TimeFactory $timeFactory) {
-		parent::__construct($appName, $request);
-
-		$this->avatarManager = $avatarManager;
-		$this->cache = $cache;
-		$this->l = $l10n;
-		$this->userManager = $userManager;
-		$this->rootFolder = $rootFolder;
-		$this->logger = $logger;
-		$this->userId = $userId;
-		$this->timeFactory = $timeFactory;
-	}
-
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @NoSameSiteCookieRequired
-	 * @PublicPage
-	 *
-	 * @param string $userId
-	 * @param int $size
-	 * @return JSONResponse|FileDisplayResponse
-	 */
-	public function getAvatar($userId, $size) {
-		if ($size <= 64) {
-			if ($size !== 64) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
-			}
-			$size = 64;
-		} else {
-			if ($size !== 512) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
-			}
-			$size = 512;
-		}
-
-		try {
-			$avatar = $this->avatarManager->getAvatar($userId);
-			$avatarFile = $avatar->getFile($size);
-			$response = new FileDisplayResponse(
-				$avatarFile,
-				Http::STATUS_OK,
-				['Content-Type' => $avatarFile->getMimeType(), 'X-NC-IsCustomAvatar' => (int)$avatar->isCustomAvatar()]
-			);
-		} catch (\Exception $e) {
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		// Cache for 1 day
-		$response->cacheFor(60 * 60 * 24);
-		return $response;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $path
-	 * @return JSONResponse
-	 */
-	public function postAvatar($path) {
-		$files = $this->request->getUploadedFile('files');
-
-		if (isset($path)) {
-			$path = stripslashes($path);
-			$userFolder = $this->rootFolder->getUserFolder($this->userId);
-			/** @var File $node */
-			$node = $userFolder->get($path);
-			if (!($node instanceof File)) {
-				return new JSONResponse(['data' => ['message' => $this->l->t('Please select a file.')]]);
-			}
-			if ($node->getSize() > 20 * 1024 * 1024) {
-				return new JSONResponse(
-					['data' => ['message' => $this->l->t('File is too big')]],
-					Http::STATUS_BAD_REQUEST
-				);
-			}
-
-			if ($node->getMimeType() !== 'image/jpeg' && $node->getMimeType() !== 'image/png') {
-				return new JSONResponse(
-					['data' => ['message' => $this->l->t('The selected file is not an image.')]],
-					Http::STATUS_BAD_REQUEST
-				);
-			}
-
-			try {
-				$content = $node->getContent();
-			} catch (\OCP\Files\NotPermittedException $e) {
-				return new JSONResponse(
-					['data' => ['message' => $this->l->t('The selected file cannot be read.')]],
-					Http::STATUS_BAD_REQUEST
-				);
-			}
-		} elseif (!is_null($files)) {
-			if (
-				$files['error'][0] === 0 &&
-				 is_uploaded_file($files['tmp_name'][0]) &&
-				!\OC\Files\Filesystem::isFileBlacklisted($files['tmp_name'][0])
-			) {
-				if ($files['size'][0] > 20 * 1024 * 1024) {
-					return new JSONResponse(
-						['data' => ['message' => $this->l->t('File is too big')]],
-						Http::STATUS_BAD_REQUEST
-					);
-				}
-				$this->cache->set('avatar_upload', file_get_contents($files['tmp_name'][0]), 7200);
-				$content = $this->cache->get('avatar_upload');
-				unlink($files['tmp_name'][0]);
-			} else {
-				$phpFileUploadErrors = [
-					UPLOAD_ERR_OK => $this->l->t('The file was uploaded'),
-					UPLOAD_ERR_INI_SIZE => $this->l->t('The uploaded file exceeds the upload_max_filesize directive in php.ini'),
-					UPLOAD_ERR_FORM_SIZE => $this->l->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
-					UPLOAD_ERR_PARTIAL => $this->l->t('The file was only partially uploaded'),
-					UPLOAD_ERR_NO_FILE => $this->l->t('No file was uploaded'),
-					UPLOAD_ERR_NO_TMP_DIR => $this->l->t('Missing a temporary folder'),
-					UPLOAD_ERR_CANT_WRITE => $this->l->t('Could not write file to disk'),
-					UPLOAD_ERR_EXTENSION => $this->l->t('A PHP extension stopped the file upload'),
-				];
-				$message = $phpFileUploadErrors[$files['error'][0]] ?? $this->l->t('Invalid file provided');
-				$this->logger->warning($message, ['app' => 'core']);
-				return new JSONResponse(
-					['data' => ['message' => $message]],
-					Http::STATUS_BAD_REQUEST
-				);
-			}
-		} else {
-			//Add imgfile
-			return new JSONResponse(
-				['data' => ['message' => $this->l->t('No image or file provided')]],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
-
-		try {
-			$image = new \OC_Image();
-			$image->loadFromData($content);
-			$image->readExif($content);
-			$image->fixOrientation();
-
-			if ($image->valid()) {
-				$mimeType = $image->mimeType();
-				if ($mimeType !== 'image/jpeg' && $mimeType !== 'image/png') {
-					return new JSONResponse(
-						['data' => ['message' => $this->l->t('Unknown filetype')]],
-						Http::STATUS_OK
-					);
-				}
-
-				$this->cache->set('tmpAvatar', $image->data(), 7200);
-				return new JSONResponse(
-					['data' => 'notsquare'],
-					Http::STATUS_OK
-				);
-			} else {
-				return new JSONResponse(
-					['data' => ['message' => $this->l->t('Invalid image')]],
-					Http::STATUS_OK
-				);
-			}
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['app' => 'core']);
-			return new JSONResponse(['data' => ['message' => $this->l->t('An error occurred. Please contact your admin.')]], Http::STATUS_OK);
-		}
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @return JSONResponse
-	 */
-	public function deleteAvatar() {
-		try {
-			$avatar = $this->avatarManager->getAvatar($this->userId);
-			$avatar->remove();
-			return new JSONResponse();
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['app' => 'core']);
-			return new JSONResponse(['data' => ['message' => $this->l->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST);
-		}
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @return JSONResponse|DataDisplayResponse
-	 */
-	public function getTmpAvatar() {
-		$tmpAvatar = $this->cache->get('tmpAvatar');
-		if (is_null($tmpAvatar)) {
-			return new JSONResponse(['data' => [
-				'message' => $this->l->t("No temporary profile picture available, try again")
-			]],
-									Http::STATUS_NOT_FOUND);
-		}
-
-		$image = new \OC_Image();
-		$image->loadFromData($tmpAvatar);
-
-		$resp = new DataDisplayResponse(
-				$image->data() ?? '',
-				Http::STATUS_OK,
-				['Content-Type' => $image->mimeType()]);
-
-		$resp->setETag((string)crc32($image->data() ?? ''));
-		$resp->cacheFor(0);
-		$resp->setLastModified(new \DateTime('now', new \DateTimeZone('GMT')));
-		return $resp;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param array $crop
-	 * @return JSONResponse
-	 */
-	public function postCroppedAvatar($crop) {
-		if (is_null($crop)) {
-			return new JSONResponse(['data' => ['message' => $this->l->t("No crop data provided")]],
-									Http::STATUS_BAD_REQUEST);
-		}
-
-		if (!isset($crop['x'], $crop['y'], $crop['w'], $crop['h'])) {
-			return new JSONResponse(['data' => ['message' => $this->l->t("No valid crop data provided")]],
-									Http::STATUS_BAD_REQUEST);
-		}
-
-		$tmpAvatar = $this->cache->get('tmpAvatar');
-		if (is_null($tmpAvatar)) {
-			return new JSONResponse(['data' => [
-				'message' => $this->l->t("No temporary profile picture available, try again")
-			]],
-									Http::STATUS_BAD_REQUEST);
-		}
-
-		$image = new \OC_Image();
-		$image->loadFromData($tmpAvatar);
-		$image->crop($crop['x'], $crop['y'], (int)round($crop['w']), (int)round($crop['h']));
-		try {
-			$avatar = $this->avatarManager->getAvatar($this->userId);
-			$avatar->set($image);
-			// Clean up
-			$this->cache->remove('tmpAvatar');
-			return new JSONResponse(['status' => 'success']);
-		} catch (\OC\NotSquareException $e) {
-			return new JSONResponse(['data' => ['message' => $this->l->t('Crop is not square')]],
-									Http::STATUS_BAD_REQUEST);
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['app' => 'core']);
-			return new JSONResponse(['data' => ['message' => $this->l->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST);
-		}
-	}
+    /** @var IAvatarManager */
+    protected $avatarManager;
+
+    /** @var ICache */
+    protected $cache;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IUserSession */
+    protected $userSession;
+
+    /** @var IRootFolder */
+    protected $rootFolder;
+
+    /** @var ILogger */
+    protected $logger;
+
+    /** @var string */
+    protected $userId;
+
+    /** @var TimeFactory */
+    protected $timeFactory;
+
+    public function __construct($appName,
+                                IRequest $request,
+                                IAvatarManager $avatarManager,
+                                ICache $cache,
+                                IL10N $l10n,
+                                IUserManager $userManager,
+                                IRootFolder $rootFolder,
+                                ILogger $logger,
+                                $userId,
+                                TimeFactory $timeFactory) {
+        parent::__construct($appName, $request);
+
+        $this->avatarManager = $avatarManager;
+        $this->cache = $cache;
+        $this->l = $l10n;
+        $this->userManager = $userManager;
+        $this->rootFolder = $rootFolder;
+        $this->logger = $logger;
+        $this->userId = $userId;
+        $this->timeFactory = $timeFactory;
+    }
+
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @NoSameSiteCookieRequired
+     * @PublicPage
+     *
+     * @param string $userId
+     * @param int $size
+     * @return JSONResponse|FileDisplayResponse
+     */
+    public function getAvatar($userId, $size) {
+        if ($size <= 64) {
+            if ($size !== 64) {
+                $this->logger->debug('Avatar requested in deprecated size ' . $size);
+            }
+            $size = 64;
+        } else {
+            if ($size !== 512) {
+                $this->logger->debug('Avatar requested in deprecated size ' . $size);
+            }
+            $size = 512;
+        }
+
+        try {
+            $avatar = $this->avatarManager->getAvatar($userId);
+            $avatarFile = $avatar->getFile($size);
+            $response = new FileDisplayResponse(
+                $avatarFile,
+                Http::STATUS_OK,
+                ['Content-Type' => $avatarFile->getMimeType(), 'X-NC-IsCustomAvatar' => (int)$avatar->isCustomAvatar()]
+            );
+        } catch (\Exception $e) {
+            return new JSONResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        // Cache for 1 day
+        $response->cacheFor(60 * 60 * 24);
+        return $response;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param string $path
+     * @return JSONResponse
+     */
+    public function postAvatar($path) {
+        $files = $this->request->getUploadedFile('files');
+
+        if (isset($path)) {
+            $path = stripslashes($path);
+            $userFolder = $this->rootFolder->getUserFolder($this->userId);
+            /** @var File $node */
+            $node = $userFolder->get($path);
+            if (!($node instanceof File)) {
+                return new JSONResponse(['data' => ['message' => $this->l->t('Please select a file.')]]);
+            }
+            if ($node->getSize() > 20 * 1024 * 1024) {
+                return new JSONResponse(
+                    ['data' => ['message' => $this->l->t('File is too big')]],
+                    Http::STATUS_BAD_REQUEST
+                );
+            }
+
+            if ($node->getMimeType() !== 'image/jpeg' && $node->getMimeType() !== 'image/png') {
+                return new JSONResponse(
+                    ['data' => ['message' => $this->l->t('The selected file is not an image.')]],
+                    Http::STATUS_BAD_REQUEST
+                );
+            }
+
+            try {
+                $content = $node->getContent();
+            } catch (\OCP\Files\NotPermittedException $e) {
+                return new JSONResponse(
+                    ['data' => ['message' => $this->l->t('The selected file cannot be read.')]],
+                    Http::STATUS_BAD_REQUEST
+                );
+            }
+        } elseif (!is_null($files)) {
+            if (
+                $files['error'][0] === 0 &&
+                 is_uploaded_file($files['tmp_name'][0]) &&
+                !\OC\Files\Filesystem::isFileBlacklisted($files['tmp_name'][0])
+            ) {
+                if ($files['size'][0] > 20 * 1024 * 1024) {
+                    return new JSONResponse(
+                        ['data' => ['message' => $this->l->t('File is too big')]],
+                        Http::STATUS_BAD_REQUEST
+                    );
+                }
+                $this->cache->set('avatar_upload', file_get_contents($files['tmp_name'][0]), 7200);
+                $content = $this->cache->get('avatar_upload');
+                unlink($files['tmp_name'][0]);
+            } else {
+                $phpFileUploadErrors = [
+                    UPLOAD_ERR_OK => $this->l->t('The file was uploaded'),
+                    UPLOAD_ERR_INI_SIZE => $this->l->t('The uploaded file exceeds the upload_max_filesize directive in php.ini'),
+                    UPLOAD_ERR_FORM_SIZE => $this->l->t('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'),
+                    UPLOAD_ERR_PARTIAL => $this->l->t('The file was only partially uploaded'),
+                    UPLOAD_ERR_NO_FILE => $this->l->t('No file was uploaded'),
+                    UPLOAD_ERR_NO_TMP_DIR => $this->l->t('Missing a temporary folder'),
+                    UPLOAD_ERR_CANT_WRITE => $this->l->t('Could not write file to disk'),
+                    UPLOAD_ERR_EXTENSION => $this->l->t('A PHP extension stopped the file upload'),
+                ];
+                $message = $phpFileUploadErrors[$files['error'][0]] ?? $this->l->t('Invalid file provided');
+                $this->logger->warning($message, ['app' => 'core']);
+                return new JSONResponse(
+                    ['data' => ['message' => $message]],
+                    Http::STATUS_BAD_REQUEST
+                );
+            }
+        } else {
+            //Add imgfile
+            return new JSONResponse(
+                ['data' => ['message' => $this->l->t('No image or file provided')]],
+                Http::STATUS_BAD_REQUEST
+            );
+        }
+
+        try {
+            $image = new \OC_Image();
+            $image->loadFromData($content);
+            $image->readExif($content);
+            $image->fixOrientation();
+
+            if ($image->valid()) {
+                $mimeType = $image->mimeType();
+                if ($mimeType !== 'image/jpeg' && $mimeType !== 'image/png') {
+                    return new JSONResponse(
+                        ['data' => ['message' => $this->l->t('Unknown filetype')]],
+                        Http::STATUS_OK
+                    );
+                }
+
+                $this->cache->set('tmpAvatar', $image->data(), 7200);
+                return new JSONResponse(
+                    ['data' => 'notsquare'],
+                    Http::STATUS_OK
+                );
+            } else {
+                return new JSONResponse(
+                    ['data' => ['message' => $this->l->t('Invalid image')]],
+                    Http::STATUS_OK
+                );
+            }
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['app' => 'core']);
+            return new JSONResponse(['data' => ['message' => $this->l->t('An error occurred. Please contact your admin.')]], Http::STATUS_OK);
+        }
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @return JSONResponse
+     */
+    public function deleteAvatar() {
+        try {
+            $avatar = $this->avatarManager->getAvatar($this->userId);
+            $avatar->remove();
+            return new JSONResponse();
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['app' => 'core']);
+            return new JSONResponse(['data' => ['message' => $this->l->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST);
+        }
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @return JSONResponse|DataDisplayResponse
+     */
+    public function getTmpAvatar() {
+        $tmpAvatar = $this->cache->get('tmpAvatar');
+        if (is_null($tmpAvatar)) {
+            return new JSONResponse(['data' => [
+                'message' => $this->l->t("No temporary profile picture available, try again")
+            ]],
+                                    Http::STATUS_NOT_FOUND);
+        }
+
+        $image = new \OC_Image();
+        $image->loadFromData($tmpAvatar);
+
+        $resp = new DataDisplayResponse(
+                $image->data() ?? '',
+                Http::STATUS_OK,
+                ['Content-Type' => $image->mimeType()]);
+
+        $resp->setETag((string)crc32($image->data() ?? ''));
+        $resp->cacheFor(0);
+        $resp->setLastModified(new \DateTime('now', new \DateTimeZone('GMT')));
+        return $resp;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param array $crop
+     * @return JSONResponse
+     */
+    public function postCroppedAvatar($crop) {
+        if (is_null($crop)) {
+            return new JSONResponse(['data' => ['message' => $this->l->t("No crop data provided")]],
+                                    Http::STATUS_BAD_REQUEST);
+        }
+
+        if (!isset($crop['x'], $crop['y'], $crop['w'], $crop['h'])) {
+            return new JSONResponse(['data' => ['message' => $this->l->t("No valid crop data provided")]],
+                                    Http::STATUS_BAD_REQUEST);
+        }
+
+        $tmpAvatar = $this->cache->get('tmpAvatar');
+        if (is_null($tmpAvatar)) {
+            return new JSONResponse(['data' => [
+                'message' => $this->l->t("No temporary profile picture available, try again")
+            ]],
+                                    Http::STATUS_BAD_REQUEST);
+        }
+
+        $image = new \OC_Image();
+        $image->loadFromData($tmpAvatar);
+        $image->crop($crop['x'], $crop['y'], (int)round($crop['w']), (int)round($crop['h']));
+        try {
+            $avatar = $this->avatarManager->getAvatar($this->userId);
+            $avatar->set($image);
+            // Clean up
+            $this->cache->remove('tmpAvatar');
+            return new JSONResponse(['status' => 'success']);
+        } catch (\OC\NotSquareException $e) {
+            return new JSONResponse(['data' => ['message' => $this->l->t('Crop is not square')]],
+                                    Http::STATUS_BAD_REQUEST);
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['app' => 'core']);
+            return new JSONResponse(['data' => ['message' => $this->l->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST);
+        }
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -116,12 +116,12 @@ 
 	public function getAvatar($userId, $size) {
 		if ($size <= 64) {
 			if ($size !== 64) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
+				$this->logger->debug('Avatar requested in deprecated size '.$size);
 			}
 			$size = 64;
 		} else {
 			if ($size !== 512) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
+				$this->logger->debug('Avatar requested in deprecated size '.$size);
 			}
 			$size = 512;
 		}
@@ -132,7 +132,7 @@ 
 			$response = new FileDisplayResponse(
 				$avatarFile,
 				Http::STATUS_OK,
-				['Content-Type' => $avatarFile->getMimeType(), 'X-NC-IsCustomAvatar' => (int)$avatar->isCustomAvatar()]
+				['Content-Type' => $avatarFile->getMimeType(), 'X-NC-IsCustomAvatar' => (int) $avatar->isCustomAvatar()]
 			);
 		} catch (\Exception $e) {
 			return new JSONResponse([], Http::STATUS_NOT_FOUND);
@@ -293,7 +293,7 @@ 
 				Http::STATUS_OK,
 				['Content-Type' => $image->mimeType()]);
 
-		$resp->setETag((string)crc32($image->data() ?? ''));
+		$resp->setETag((string) crc32($image->data() ?? ''));
 		$resp->cacheFor(0);
 		$resp->setLastModified(new \DateTime('now', new \DateTimeZone('GMT')));
 		return $resp;
@@ -326,7 +326,7 @@ 
 
 		$image = new \OC_Image();
 		$image->loadFromData($tmpAvatar);
-		$image->crop($crop['x'], $crop['y'], (int)round($crop['w']), (int)round($crop['h']));
+		$image->crop($crop['x'], $crop['y'], (int) round($crop['w']), (int) round($crop['h']));
 		try {
 			$avatar = $this->avatarManager->getAvatar($this->userId);
 			$avatar->set($image);

core/Controller/GuestAvatarController.php

Indentation +69 added lines, -69 removed lines

@@ -34,80 +34,80 @@
  */
 class GuestAvatarController extends Controller {
 
-	/**
-	 * @var ILogger
-	 */
-	private $logger;
+    /**
+     * @var ILogger
+     */
+    private $logger;
 
-	/**
-	 * @var IAvatarManager
-	 */
-	private $avatarManager;
+    /**
+     * @var IAvatarManager
+     */
+    private $avatarManager;
 
-	/**
-	 * GuestAvatarController constructor.
-	 *
-	 * @param $appName
-	 * @param IRequest $request
-	 * @param IAvatarManager $avatarManager
-	 * @param ILogger $logger
-	 */
-	public function __construct(
-		$appName,
-		IRequest $request,
-		IAvatarManager $avatarManager,
-		ILogger $logger
-	) {
-		parent::__construct($appName, $request);
-		$this->avatarManager = $avatarManager;
-		$this->logger = $logger;
-	}
+    /**
+     * GuestAvatarController constructor.
+     *
+     * @param $appName
+     * @param IRequest $request
+     * @param IAvatarManager $avatarManager
+     * @param ILogger $logger
+     */
+    public function __construct(
+        $appName,
+        IRequest $request,
+        IAvatarManager $avatarManager,
+        ILogger $logger
+    ) {
+        parent::__construct($appName, $request);
+        $this->avatarManager = $avatarManager;
+        $this->logger = $logger;
+    }
 
-	/**
-	 * Returns a guest avatar image response.
-	 *
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param string $guestName The guest name, e.g. "Albert"
-	 * @param string $size The desired avatar size, e.g. 64 for 64x64px
-	 * @return FileDisplayResponse|Http\Response
-	 */
-	public function getAvatar($guestName, $size) {
-		$size = (int) $size;
+    /**
+     * Returns a guest avatar image response.
+     *
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param string $guestName The guest name, e.g. "Albert"
+     * @param string $size The desired avatar size, e.g. 64 for 64x64px
+     * @return FileDisplayResponse|Http\Response
+     */
+    public function getAvatar($guestName, $size) {
+        $size = (int) $size;
 
-		if ($size <= 64) {
-			if ($size !== 64) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
-			}
-			$size = 64;
-		} else {
-			if ($size !== 512) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
-			}
-			$size = 512;
-		}
+        if ($size <= 64) {
+            if ($size !== 64) {
+                $this->logger->debug('Avatar requested in deprecated size ' . $size);
+            }
+            $size = 64;
+        } else {
+            if ($size !== 512) {
+                $this->logger->debug('Avatar requested in deprecated size ' . $size);
+            }
+            $size = 512;
+        }
 
-		try {
-			$avatar = $this->avatarManager->getGuestAvatar($guestName);
-			$avatarFile = $avatar->getFile($size);
+        try {
+            $avatar = $this->avatarManager->getGuestAvatar($guestName);
+            $avatarFile = $avatar->getFile($size);
 
-			$resp = new FileDisplayResponse(
-				$avatarFile,
-				$avatar->isCustomAvatar() ? Http::STATUS_OK : Http::STATUS_CREATED,
-				['Content-Type' => $avatarFile->getMimeType()]
-			);
-		} catch (\Exception $e) {
-			$this->logger->error('error while creating guest avatar', [
-				'err' => $e,
-			]);
-			$resp = new Http\Response();
-			$resp->setStatus(Http::STATUS_INTERNAL_SERVER_ERROR);
-			return $resp;
-		}
+            $resp = new FileDisplayResponse(
+                $avatarFile,
+                $avatar->isCustomAvatar() ? Http::STATUS_OK : Http::STATUS_CREATED,
+                ['Content-Type' => $avatarFile->getMimeType()]
+            );
+        } catch (\Exception $e) {
+            $this->logger->error('error while creating guest avatar', [
+                'err' => $e,
+            ]);
+            $resp = new Http\Response();
+            $resp->setStatus(Http::STATUS_INTERNAL_SERVER_ERROR);
+            return $resp;
+        }
 
-		// Cache for 30 minutes
-		$resp->cacheFor(1800);
-		return $resp;
-	}
+        // Cache for 30 minutes
+        $resp->cacheFor(1800);
+        return $resp;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -78,12 +78,12 @@
 
 		if ($size <= 64) {
 			if ($size !== 64) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
+				$this->logger->debug('Avatar requested in deprecated size '.$size);
 			}
 			$size = 64;
 		} else {
 			if ($size !== 512) {
-				$this->logger->debug('Avatar requested in deprecated size ' . $size);
+				$this->logger->debug('Avatar requested in deprecated size '.$size);
 			}
 			$size = 512;
 		}