nextcloud / server

lib/public/Files/SimpleFS/InMemoryFile.php

Indentation +115 added lines, -115 removed lines

@@ -32,119 +32,119 @@
  * @since 16.0.0
  */
 class InMemoryFile implements ISimpleFile {
-	/**
-	 * Holds the file name.
-	 *
-	 * @var string
-	 */
-	private $name;
-
-	/**
-	 * Holds the file contents.
-	 *
-	 * @var string
-	 */
-	private $contents;
-
-	/**
-	 * InMemoryFile constructor.
-	 *
-	 * @param string $name The file name
-	 * @param string $contents The file contents
-	 * @since 16.0.0
-	 */
-	public function __construct(string $name, string $contents) {
-		$this->name = $name;
-		$this->contents = $contents;
-	}
-
-	/**
-	 * @inheritdoc
-	 * @since 16.0.0
-	 */
-	public function getName() {
-		return $this->name;
-	}
-
-	/**
-	 * @inheritdoc
-	 * @since 16.0.0
-	 */
-	public function getSize() {
-		return strlen($this->contents);
-	}
-
-	/**
-	 * @inheritdoc
-	 * @since 16.0.0
-	 */
-	public function getETag() {
-		return '';
-	}
-
-	/**
-	 * @inheritdoc
-	 * @since 16.0.0
-	 */
-	public function getMTime() {
-		return time();
-	}
-
-	/**
-	 * @inheritdoc
-	 * @since 16.0.0
-	 */
-	public function getContent() {
-		return $this->contents;
-	}
-
-	/**
-	 * @inheritdoc
-	 * @since 16.0.0
-	 */
-	public function putContent($data) {
-		$this->contents = $data;
-	}
-
-	/**
-	 * In memory files can't be deleted.
-	 *
-	 * @since 16.0.0
-	 */
-	public function delete() {
-		// unimplemented for in memory files
-	}
-
-	/**
-	 * @inheritdoc
-	 * @since 16.0.0
-	 */
-	public function getMimeType() {
-		$fileInfo = new \finfo(FILEINFO_MIME_TYPE);
-		return $fileInfo->buffer($this->contents);
-	}
-
-	/**
-	 * Stream reading is unsupported for in memory files.
-	 *
-	 * @throws NotPermittedException
-	 * @since 16.0.0
-	 */
-	public function read() {
-		throw new NotPermittedException(
-			'Stream reading is unsupported for in memory files'
-		);
-	}
-
-	/**
-	 * Stream writing isn't available for in memory files.
-	 *
-	 * @throws NotPermittedException
-	 * @since 16.0.0
-	 */
-	public function write() {
-		throw new NotPermittedException(
-			'Stream writing is unsupported for in memory files'
-		);
-	}
+    /**
+     * Holds the file name.
+     *
+     * @var string
+     */
+    private $name;
+
+    /**
+     * Holds the file contents.
+     *
+     * @var string
+     */
+    private $contents;
+
+    /**
+     * InMemoryFile constructor.
+     *
+     * @param string $name The file name
+     * @param string $contents The file contents
+     * @since 16.0.0
+     */
+    public function __construct(string $name, string $contents) {
+        $this->name = $name;
+        $this->contents = $contents;
+    }
+
+    /**
+     * @inheritdoc
+     * @since 16.0.0
+     */
+    public function getName() {
+        return $this->name;
+    }
+
+    /**
+     * @inheritdoc
+     * @since 16.0.0
+     */
+    public function getSize() {
+        return strlen($this->contents);
+    }
+
+    /**
+     * @inheritdoc
+     * @since 16.0.0
+     */
+    public function getETag() {
+        return '';
+    }
+
+    /**
+     * @inheritdoc
+     * @since 16.0.0
+     */
+    public function getMTime() {
+        return time();
+    }
+
+    /**
+     * @inheritdoc
+     * @since 16.0.0
+     */
+    public function getContent() {
+        return $this->contents;
+    }
+
+    /**
+     * @inheritdoc
+     * @since 16.0.0
+     */
+    public function putContent($data) {
+        $this->contents = $data;
+    }
+
+    /**
+     * In memory files can't be deleted.
+     *
+     * @since 16.0.0
+     */
+    public function delete() {
+        // unimplemented for in memory files
+    }
+
+    /**
+     * @inheritdoc
+     * @since 16.0.0
+     */
+    public function getMimeType() {
+        $fileInfo = new \finfo(FILEINFO_MIME_TYPE);
+        return $fileInfo->buffer($this->contents);
+    }
+
+    /**
+     * Stream reading is unsupported for in memory files.
+     *
+     * @throws NotPermittedException
+     * @since 16.0.0
+     */
+    public function read() {
+        throw new NotPermittedException(
+            'Stream reading is unsupported for in memory files'
+        );
+    }
+
+    /**
+     * Stream writing isn't available for in memory files.
+     *
+     * @throws NotPermittedException
+     * @since 16.0.0
+     */
+    public function write() {
+        throw new NotPermittedException(
+            'Stream writing is unsupported for in memory files'
+        );
+    }
 }

lib/public/IAvatarManager.php

Indentation +18 added lines, -18 removed lines

@@ -34,24 +34,24 @@
 
 interface IAvatarManager {
 
-	/**
-	 * return a user specific instance of \OCP\IAvatar
-	 * @see IAvatar
-	 * @param string $user the ownCloud user id
-	 * @return IAvatar
-	 * @throws \Exception In case the username is potentially dangerous
-	 * @throws \OCP\Files\NotFoundException In case there is no user folder yet
-	 * @since 6.0.0
-	 */
-	public function getAvatar(string $user) : IAvatar;
+    /**
+     * return a user specific instance of \OCP\IAvatar
+     * @see IAvatar
+     * @param string $user the ownCloud user id
+     * @return IAvatar
+     * @throws \Exception In case the username is potentially dangerous
+     * @throws \OCP\Files\NotFoundException In case there is no user folder yet
+     * @since 6.0.0
+     */
+    public function getAvatar(string $user) : IAvatar;
 
-	/**
-	 * Returns a guest user avatar instance.
-	 *
-	 * @param string $name The guest name, e.g. "Albert".
-	 * @return IAvatar
-	 * @since 16.0.0
-	 */
-	public function getGuestAvatar(string $name): IAvatar;
+    /**
+     * Returns a guest user avatar instance.
+     *
+     * @param string $name The guest name, e.g. "Albert".
+     * @return IAvatar
+     * @since 16.0.0
+     */
+    public function getGuestAvatar(string $name): IAvatar;
 
 }

lib/private/Avatar/Avatar.php

Indentation +266 added lines, -266 removed lines

@@ -44,275 +44,275 @@
  */
 abstract class Avatar implements IAvatar {
 
-	/** @var ILogger  */
-	protected $logger;
-
-	/**
-	 * https://github.com/sebdesign/cap-height -- for 500px height
-	 * Automated check: https://codepen.io/skjnldsv/pen/PydLBK/
-	 * Nunito cap-height is 0.716 and we want a 200px caps height size
-	 * (0.4 letter-to-total-height ratio, 500*0.4=200), so: 200/0.716 = 279px.
-	 * Since we start from the baseline (text-anchor) we need to
-	 * shift the y axis by 100px (half the caps height): 500/2+100=350
-	 *
-	 * @var string
-	 */
-	private $svgTemplate = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+    /** @var ILogger  */
+    protected $logger;
+
+    /**
+     * https://github.com/sebdesign/cap-height -- for 500px height
+     * Automated check: https://codepen.io/skjnldsv/pen/PydLBK/
+     * Nunito cap-height is 0.716 and we want a 200px caps height size
+     * (0.4 letter-to-total-height ratio, 500*0.4=200), so: 200/0.716 = 279px.
+     * Since we start from the baseline (text-anchor) we need to
+     * shift the y axis by 100px (half the caps height): 500/2+100=350
+     *
+     * @var string
+     */
+    private $svgTemplate = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 		<svg width="{size}" height="{size}" version="1.1" viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
 			<rect width="100%" height="100%" fill="#{fill}"></rect>
 			<text x="50%" y="350" style="font-weight:normal;font-size:279px;font-family:\'Nunito\';text-anchor:middle;fill:#fff">{letter}</text>
 		</svg>';
 
-	/**
-	 * The base avatar constructor.
-	 *
-	 * @param ILogger $logger The logger
-	 */
-	public function __construct(ILogger $logger) {
-		$this->logger = $logger;
-	}
-
-	/**
-	 * Returns the user display name.
-	 *
-	 * @return string
-	 */
-	abstract public function getDisplayName(): string;
-
-	/**
-	 * Returns the first letter of the display name, or "?" if no name given.
-	 *
-	 * @return string
-	 */
-	private function getAvatarLetter(): string {
-		$displayName = $this->getDisplayName();
-		if (empty($displayName) === true) {
-			return '?';
-		} else {
-			return mb_strtoupper(mb_substr($displayName, 0, 1), 'UTF-8');
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function get($size = 64) {
-		$size = (int) $size;
-
-		try {
-			$file = $this->getFile($size);
-		} catch (NotFoundException $e) {
-			return false;
-		}
-
-		$avatar = new OC_Image();
-		$avatar->loadFromData($file->getContent());
-		return $avatar;
-	}
-
-	/**
-	 * {size} = 500
-	 * {fill} = hex color to fill
-	 * {letter} = Letter to display
-	 *
-	 * Generate SVG avatar
-	 *
-	 * @param int $size The requested image size in pixel
-	 * @return string
-	 *
-	 */
-	protected function getAvatarVector(int $size): string {
-		$userDisplayName = $this->getDisplayName();
-		$bgRGB = $this->avatarBackgroundColor($userDisplayName);
-		$bgHEX = sprintf("%02x%02x%02x", $bgRGB->r, $bgRGB->g, $bgRGB->b);
-		$letter = $this->getAvatarLetter();
-		$toReplace = ['{size}', '{fill}', '{letter}'];
-		return str_replace($toReplace, [$size, $bgHEX, $letter], $this->svgTemplate);
-	}
-
-	/**
-	 * Generate png avatar from svg with Imagick
-	 *
-	 * @param int $size
-	 * @return string|boolean
-	 */
-	protected function generateAvatarFromSvg(int $size) {
-		if (!extension_loaded('imagick')) {
-			return false;
-		}
-		try {
-			$font = __DIR__ . '/../../core/fonts/Nunito-Regular.ttf';
-			$svg = $this->getAvatarVector($size);
-			$avatar = new Imagick();
-			$avatar->setFont($font);
-			$avatar->readImageBlob($svg);
-			$avatar->setImageFormat('png');
-			$image = new OC_Image();
-			$image->loadFromData($avatar);
-			return $image->data();
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Generate png avatar with GD
-	 *
-	 * @param string $userDisplayName
-	 * @param int $size
-	 * @return string
-	 */
-	protected function generateAvatar($userDisplayName, $size) {
-		$letter = $this->getAvatarLetter();
-		$backgroundColor = $this->avatarBackgroundColor($userDisplayName);
-
-		$im = imagecreatetruecolor($size, $size);
-		$background = imagecolorallocate(
-			$im,
-			$backgroundColor->r,
-			$backgroundColor->g,
-			$backgroundColor->b
-		);
-		$white = imagecolorallocate($im, 255, 255, 255);
-		imagefilledrectangle($im, 0, 0, $size, $size, $background);
-
-		$font = __DIR__ . '/../../../core/fonts/Nunito-Regular.ttf';
-
-		$fontSize = $size * 0.4;
-		list($x, $y) = $this->imageTTFCenter(
-			$im, $letter, $font, (int)$fontSize
-		);
-
-		imagettftext($im, $fontSize, 0, $x, $y, $white, $font, $letter);
-
-		ob_start();
-		imagepng($im);
-		$data = ob_get_contents();
-		ob_end_clean();
-
-		return $data;
-	}
-
-	/**
-	 * Calculate real image ttf center
-	 *
-	 * @param resource $image
-	 * @param string $text text string
-	 * @param string $font font path
-	 * @param int $size font size
-	 * @param int $angle
-	 * @return array
-	 */
-	protected function imageTTFCenter(
-		$image,
-		string $text,
-		string $font,
-		int $size,
-		$angle = 0
-	): array {
-		// Image width & height
-		$xi = imagesx($image);
-		$yi = imagesy($image);
-
-		// bounding box
-		$box = imagettfbbox($size, $angle, $font, $text);
-
-		// imagettfbbox can return negative int
-		$xr = abs(max($box[2], $box[4]));
-		$yr = abs(max($box[5], $box[7]));
-
-		// calculate bottom left placement
-		$x = intval(($xi - $xr) / 2);
-		$y = intval(($yi + $yr) / 2);
-
-		return array($x, $y);
-	}
-
-	/**
-	 * Calculate steps between two Colors
-	 * @param object Color $steps start color
-	 * @param object Color $ends end color
-	 * @return array [r,g,b] steps for each color to go from $steps to $ends
-	 */
-	private function stepCalc($steps, $ends) {
-		$step = array();
-		$step[0] = ($ends[1]->r - $ends[0]->r) / $steps;
-		$step[1] = ($ends[1]->g - $ends[0]->g) / $steps;
-		$step[2] = ($ends[1]->b - $ends[0]->b) / $steps;
-		return $step;
-	}
-
-	/**
-	 * Convert a string to an integer evenly
-	 * @param string $hash the text to parse
-	 * @param int $maximum the maximum range
-	 * @return int[] between 0 and $maximum
-	 */
-	private function mixPalette($steps, $color1, $color2) {
-		$palette = array($color1);
-		$step = $this->stepCalc($steps, [$color1, $color2]);
-		for ($i = 1; $i < $steps; $i++) {
-			$r = intval($color1->r + ($step[0] * $i));
-			$g = intval($color1->g + ($step[1] * $i));
-			$b = intval($color1->b + ($step[2] * $i));
-			$palette[] = new Color($r, $g, $b);
-		}
-		return $palette;
-	}
-
-	/**
-	 * Convert a string to an integer evenly
-	 * @param string $hash the text to parse
-	 * @param int $maximum the maximum range
-	 * @return int between 0 and $maximum
-	 */
-	private function hashToInt($hash, $maximum) {
-		$final = 0;
-		$result = array();
-
-		// Splitting evenly the string
-		for ($i = 0; $i < strlen($hash); $i++) {
-			// chars in md5 goes up to f, hex:16
-			$result[] = intval(substr($hash, $i, 1), 16) % 16;
-		}
-		// Adds up all results
-		foreach ($result as $value) {
-			$final += $value;
-		}
-		// chars in md5 goes up to f, hex:16
-		return intval($final % $maximum);
-	}
-
-	/**
-	 * @param string $hash
-	 * @return Color Object containting r g b int in the range [0, 255]
-	 */
-	public function avatarBackgroundColor(string $hash) {
-		// Normalize hash
-		$hash = strtolower($hash);
-
-		// Already a md5 hash?
-		if( preg_match('/^([0-9a-f]{4}-?){8}$/', $hash, $matches) !== 1 ) {
-			$hash = md5($hash);
-		}
-
-		// Remove unwanted char
-		$hash = preg_replace('/[^0-9a-f]+/', '', $hash);
-
-		$red = new Color(182, 70, 157);
-		$yellow = new Color(221, 203, 85);
-		$blue = new Color(0, 130, 201); // Nextcloud blue
-
-		// Number of steps to go from a color to another
-		// 3 colors * 6 will result in 18 generated colors
-		$steps = 6;
-
-		$palette1 = $this->mixPalette($steps, $red, $yellow);
-		$palette2 = $this->mixPalette($steps, $yellow, $blue);
-		$palette3 = $this->mixPalette($steps, $blue, $red);
-
-		$finalPalette = array_merge($palette1, $palette2, $palette3);
-
-		return $finalPalette[$this->hashToInt($hash, $steps * 3)];
-	}
+    /**
+     * The base avatar constructor.
+     *
+     * @param ILogger $logger The logger
+     */
+    public function __construct(ILogger $logger) {
+        $this->logger = $logger;
+    }
+
+    /**
+     * Returns the user display name.
+     *
+     * @return string
+     */
+    abstract public function getDisplayName(): string;
+
+    /**
+     * Returns the first letter of the display name, or "?" if no name given.
+     *
+     * @return string
+     */
+    private function getAvatarLetter(): string {
+        $displayName = $this->getDisplayName();
+        if (empty($displayName) === true) {
+            return '?';
+        } else {
+            return mb_strtoupper(mb_substr($displayName, 0, 1), 'UTF-8');
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function get($size = 64) {
+        $size = (int) $size;
+
+        try {
+            $file = $this->getFile($size);
+        } catch (NotFoundException $e) {
+            return false;
+        }
+
+        $avatar = new OC_Image();
+        $avatar->loadFromData($file->getContent());
+        return $avatar;
+    }
+
+    /**
+     * {size} = 500
+     * {fill} = hex color to fill
+     * {letter} = Letter to display
+     *
+     * Generate SVG avatar
+     *
+     * @param int $size The requested image size in pixel
+     * @return string
+     *
+     */
+    protected function getAvatarVector(int $size): string {
+        $userDisplayName = $this->getDisplayName();
+        $bgRGB = $this->avatarBackgroundColor($userDisplayName);
+        $bgHEX = sprintf("%02x%02x%02x", $bgRGB->r, $bgRGB->g, $bgRGB->b);
+        $letter = $this->getAvatarLetter();
+        $toReplace = ['{size}', '{fill}', '{letter}'];
+        return str_replace($toReplace, [$size, $bgHEX, $letter], $this->svgTemplate);
+    }
+
+    /**
+     * Generate png avatar from svg with Imagick
+     *
+     * @param int $size
+     * @return string|boolean
+     */
+    protected function generateAvatarFromSvg(int $size) {
+        if (!extension_loaded('imagick')) {
+            return false;
+        }
+        try {
+            $font = __DIR__ . '/../../core/fonts/Nunito-Regular.ttf';
+            $svg = $this->getAvatarVector($size);
+            $avatar = new Imagick();
+            $avatar->setFont($font);
+            $avatar->readImageBlob($svg);
+            $avatar->setImageFormat('png');
+            $image = new OC_Image();
+            $image->loadFromData($avatar);
+            return $image->data();
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Generate png avatar with GD
+     *
+     * @param string $userDisplayName
+     * @param int $size
+     * @return string
+     */
+    protected function generateAvatar($userDisplayName, $size) {
+        $letter = $this->getAvatarLetter();
+        $backgroundColor = $this->avatarBackgroundColor($userDisplayName);
+
+        $im = imagecreatetruecolor($size, $size);
+        $background = imagecolorallocate(
+            $im,
+            $backgroundColor->r,
+            $backgroundColor->g,
+            $backgroundColor->b
+        );
+        $white = imagecolorallocate($im, 255, 255, 255);
+        imagefilledrectangle($im, 0, 0, $size, $size, $background);
+
+        $font = __DIR__ . '/../../../core/fonts/Nunito-Regular.ttf';
+
+        $fontSize = $size * 0.4;
+        list($x, $y) = $this->imageTTFCenter(
+            $im, $letter, $font, (int)$fontSize
+        );
+
+        imagettftext($im, $fontSize, 0, $x, $y, $white, $font, $letter);
+
+        ob_start();
+        imagepng($im);
+        $data = ob_get_contents();
+        ob_end_clean();
+
+        return $data;
+    }
+
+    /**
+     * Calculate real image ttf center
+     *
+     * @param resource $image
+     * @param string $text text string
+     * @param string $font font path
+     * @param int $size font size
+     * @param int $angle
+     * @return array
+     */
+    protected function imageTTFCenter(
+        $image,
+        string $text,
+        string $font,
+        int $size,
+        $angle = 0
+    ): array {
+        // Image width & height
+        $xi = imagesx($image);
+        $yi = imagesy($image);
+
+        // bounding box
+        $box = imagettfbbox($size, $angle, $font, $text);
+
+        // imagettfbbox can return negative int
+        $xr = abs(max($box[2], $box[4]));
+        $yr = abs(max($box[5], $box[7]));
+
+        // calculate bottom left placement
+        $x = intval(($xi - $xr) / 2);
+        $y = intval(($yi + $yr) / 2);
+
+        return array($x, $y);
+    }
+
+    /**
+     * Calculate steps between two Colors
+     * @param object Color $steps start color
+     * @param object Color $ends end color
+     * @return array [r,g,b] steps for each color to go from $steps to $ends
+     */
+    private function stepCalc($steps, $ends) {
+        $step = array();
+        $step[0] = ($ends[1]->r - $ends[0]->r) / $steps;
+        $step[1] = ($ends[1]->g - $ends[0]->g) / $steps;
+        $step[2] = ($ends[1]->b - $ends[0]->b) / $steps;
+        return $step;
+    }
+
+    /**
+     * Convert a string to an integer evenly
+     * @param string $hash the text to parse
+     * @param int $maximum the maximum range
+     * @return int[] between 0 and $maximum
+     */
+    private function mixPalette($steps, $color1, $color2) {
+        $palette = array($color1);
+        $step = $this->stepCalc($steps, [$color1, $color2]);
+        for ($i = 1; $i < $steps; $i++) {
+            $r = intval($color1->r + ($step[0] * $i));
+            $g = intval($color1->g + ($step[1] * $i));
+            $b = intval($color1->b + ($step[2] * $i));
+            $palette[] = new Color($r, $g, $b);
+        }
+        return $palette;
+    }
+
+    /**
+     * Convert a string to an integer evenly
+     * @param string $hash the text to parse
+     * @param int $maximum the maximum range
+     * @return int between 0 and $maximum
+     */
+    private function hashToInt($hash, $maximum) {
+        $final = 0;
+        $result = array();
+
+        // Splitting evenly the string
+        for ($i = 0; $i < strlen($hash); $i++) {
+            // chars in md5 goes up to f, hex:16
+            $result[] = intval(substr($hash, $i, 1), 16) % 16;
+        }
+        // Adds up all results
+        foreach ($result as $value) {
+            $final += $value;
+        }
+        // chars in md5 goes up to f, hex:16
+        return intval($final % $maximum);
+    }
+
+    /**
+     * @param string $hash
+     * @return Color Object containting r g b int in the range [0, 255]
+     */
+    public function avatarBackgroundColor(string $hash) {
+        // Normalize hash
+        $hash = strtolower($hash);
+
+        // Already a md5 hash?
+        if( preg_match('/^([0-9a-f]{4}-?){8}$/', $hash, $matches) !== 1 ) {
+            $hash = md5($hash);
+        }
+
+        // Remove unwanted char
+        $hash = preg_replace('/[^0-9a-f]+/', '', $hash);
+
+        $red = new Color(182, 70, 157);
+        $yellow = new Color(221, 203, 85);
+        $blue = new Color(0, 130, 201); // Nextcloud blue
+
+        // Number of steps to go from a color to another
+        // 3 colors * 6 will result in 18 generated colors
+        $steps = 6;
+
+        $palette1 = $this->mixPalette($steps, $red, $yellow);
+        $palette2 = $this->mixPalette($steps, $yellow, $blue);
+        $palette3 = $this->mixPalette($steps, $blue, $red);
+
+        $finalPalette = array_merge($palette1, $palette2, $palette3);
+
+        return $finalPalette[$this->hashToInt($hash, $steps * 3)];
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -141,7 +141,7 @@ 
 			return false;
 		}
 		try {
-			$font = __DIR__ . '/../../core/fonts/Nunito-Regular.ttf';
+			$font = __DIR__.'/../../core/fonts/Nunito-Regular.ttf';
 			$svg = $this->getAvatarVector($size);
 			$avatar = new Imagick();
 			$avatar->setFont($font);
@@ -176,11 +176,11 @@ 
 		$white = imagecolorallocate($im, 255, 255, 255);
 		imagefilledrectangle($im, 0, 0, $size, $size, $background);
 
-		$font = __DIR__ . '/../../../core/fonts/Nunito-Regular.ttf';
+		$font = __DIR__.'/../../../core/fonts/Nunito-Regular.ttf';
 
 		$fontSize = $size * 0.4;
 		list($x, $y) = $this->imageTTFCenter(
-			$im, $letter, $font, (int)$fontSize
+			$im, $letter, $font, (int) $fontSize
 		);
 
 		imagettftext($im, $fontSize, 0, $x, $y, $white, $font, $letter);
@@ -292,7 +292,7 @@ 
 		$hash = strtolower($hash);
 
 		// Already a md5 hash?
-		if( preg_match('/^([0-9a-f]{4}-?){8}$/', $hash, $matches) !== 1 ) {
+		if (preg_match('/^([0-9a-f]{4}-?){8}$/', $hash, $matches) !== 1) {
 			$hash = md5($hash);
 		}
 

lib/private/Avatar/UserAvatar.php

Indentation +294 added lines, -294 removed lines

@@ -39,298 +39,298 @@
  * This class represents a registered user's avatar.
  */
 class UserAvatar extends Avatar {
-	/** @var IConfig */
-	private $config;
-
-	/** @var ISimpleFolder */
-	private $folder;
-
-	/** @var IL10N */
-	private $l;
-
-	/** @var User */
-	private $user;
-
-	/**
-	 * UserAvatar constructor.
-	 *
-	 * @param IConfig $config The configuration
-	 * @param ISimpleFolder $folder The avatar files folder
-	 * @param IL10N $l The localization helper
-	 * @param User $user The user this class manages the avatar for
-	 * @param ILogger $logger The logger
-	 */
-	public function __construct(
-		ISimpleFolder $folder,
-		IL10N $l,
-		$user,
-		ILogger $logger,
-		IConfig $config) {
-		parent::__construct($logger);
-		$this->folder = $folder;
-		$this->l = $l;
-		$this->user = $user;
-		$this->config = $config;
-	}
-
-	/**
-	 * Check if an avatar exists for the user
-	 *
-	 * @return bool
-	 */
-	public function exists() {
-		return $this->folder->fileExists('avatar.jpg') || $this->folder->fileExists('avatar.png');
-	}
-
-	/**
-	 * Sets the users avatar.
-	 *
-	 * @param IImage|resource|string $data An image object, imagedata or path to set a new avatar
-	 * @throws \Exception if the provided file is not a jpg or png image
-	 * @throws \Exception if the provided image is not valid
-	 * @throws NotSquareException if the image is not square
-	 * @return void
-	 */
-	public function set($data) {
-		$img = $this->getAvatarImage($data);
-		$data = $img->data();
-
-		$this->validateAvatar($img);
-
-		$this->remove();
-		$type = $this->getAvatarImageType($img);
-		$file = $this->folder->newFile('avatar.' . $type);
-		$file->putContent($data);
-
-		try {
-			$generated = $this->folder->getFile('generated');
-			$this->config->setUserValue($this->user->getUID(), 'avatar', 'generated', 'false');
-			$generated->delete();
-		} catch (NotFoundException $e) {
-			//
-		}
-
-		$this->user->triggerChange('avatar', $file);
-	}
-
-	/**
-	 * Returns an image from several sources.
-	 *
-	 * @param IImage|resource|string $data An image object, imagedata or path to the avatar
-	 * @return IImage
-	 */
-	private function getAvatarImage($data) {
-		if ($data instanceof IImage) {
-			return $data;
-		}
-
-		$img = new OC_Image();
-		if (is_resource($data) && get_resource_type($data) === 'gd') {
-			$img->setResource($data);
-		} elseif (is_resource($data)) {
-			$img->loadFromFileHandle($data);
-		} else {
-			try {
-				// detect if it is a path or maybe the images as string
-				$result = @realpath($data);
-				if ($result === false || $result === null) {
-					$img->loadFromData($data);
-				} else {
-					$img->loadFromFile($data);
-				}
-			} catch (\Error $e) {
-				$img->loadFromData($data);
-			}
-		}
-
-		return $img;
-	}
-
-	/**
-	 * Returns the avatar image type.
-	 *
-	 * @param IImage $avatar
-	 * @return string
-	 */
-	private function getAvatarImageType(IImage $avatar) {
-		$type = substr($avatar->mimeType(), -3);
-		if ($type === 'peg') {
-			$type = 'jpg';
-		}
-		return $type;
-	}
-
-	/**
-	 * Validates an avatar image:
-	 * - must be "png" or "jpg"
-	 * - must be "valid"
-	 * - must be in square format
-	 *
-	 * @param IImage $avatar The avatar to validate
-	 * @throws \Exception if the provided file is not a jpg or png image
-	 * @throws \Exception if the provided image is not valid
-	 * @throws NotSquareException if the image is not square
-	 */
-	private function validateAvatar(IImage $avatar) {
-		$type = $this->getAvatarImageType($avatar);
-
-		if ($type !== 'jpg' && $type !== 'png') {
-			throw new \Exception($this->l->t('Unknown filetype'));
-		}
-
-		if (!$avatar->valid()) {
-			throw new \Exception($this->l->t('Invalid image'));
-		}
-
-		if (!($avatar->height() === $avatar->width())) {
-			throw new NotSquareException($this->l->t('Avatar image is not square'));
-		}
-	}
-
-	/**
-	 * Removes the users avatar.
-	 * @return void
-	 * @throws \OCP\Files\NotPermittedException
-	 * @throws \OCP\PreConditionNotMetException
-	 */
-	public function remove() {
-		$avatars = $this->folder->getDirectoryListing();
-
-		$this->config->setUserValue($this->user->getUID(), 'avatar', 'version',
-			(int) $this->config->getUserValue($this->user->getUID(), 'avatar', 'version', 0) + 1);
-
-		foreach ($avatars as $avatar) {
-			$avatar->delete();
-		}
-		$this->config->setUserValue($this->user->getUID(), 'avatar', 'generated', 'true');
-		$this->user->triggerChange('avatar', '');
-	}
-
-	/**
-	 * Get the extension of the avatar. If there is no avatar throw Exception
-	 *
-	 * @return string
-	 * @throws NotFoundException
-	 */
-	private function getExtension() {
-		if ($this->folder->fileExists('avatar.jpg')) {
-			return 'jpg';
-		} elseif ($this->folder->fileExists('avatar.png')) {
-			return 'png';
-		}
-		throw new NotFoundException;
-	}
-
-	/**
-	 * Returns the avatar for an user.
-	 *
-	 * If there is no avatar file yet, one is generated.
-	 *
-	 * @param int $size
-	 * @return ISimpleFile
-	 * @throws NotFoundException
-	 * @throws \OCP\Files\NotPermittedException
-	 * @throws \OCP\PreConditionNotMetException
-	 */
-	public function getFile($size) {
-		$size = (int) $size;
-
-		try {
-			$ext = $this->getExtension();
-		} catch (NotFoundException $e) {
-			if (!$data = $this->generateAvatarFromSvg(1024)) {
-				$data = $this->generateAvatar($this->getDisplayName(), 1024);
-			}
-			$avatar = $this->folder->newFile('avatar.png');
-			$avatar->putContent($data);
-			$ext = 'png';
-
-			$this->folder->newFile('generated');
-			$this->config->setUserValue($this->user->getUID(), 'avatar', 'generated', 'true');
-		}
-
-		if ($size === -1) {
-			$path = 'avatar.' . $ext;
-		} else {
-			$path = 'avatar.' . $size . '.' . $ext;
-		}
-
-		try {
-			$file = $this->folder->getFile($path);
-		} catch (NotFoundException $e) {
-			if ($size <= 0) {
-				throw new NotFoundException;
-			}
-
-			if ($this->folder->fileExists('generated')) {
-				if (!$data = $this->generateAvatarFromSvg($size)) {
-					$data = $this->generateAvatar($this->getDisplayName(), $size);
-				}
-
-			} else {
-				$avatar = new OC_Image();
-				$file = $this->folder->getFile('avatar.' . $ext);
-				$avatar->loadFromData($file->getContent());
-				$avatar->resize($size);
-				$data = $avatar->data();
-			}
-
-			try {
-				$file = $this->folder->newFile($path);
-				$file->putContent($data);
-			} catch (NotPermittedException $e) {
-				$this->logger->error('Failed to save avatar for ' . $this->user->getUID());
-				throw new NotFoundException();
-			}
-
-		}
-
-		if ($this->config->getUserValue($this->user->getUID(), 'avatar', 'generated', null) === null) {
-			$generated = $this->folder->fileExists('generated') ? 'true' : 'false';
-			$this->config->setUserValue($this->user->getUID(), 'avatar', 'generated', $generated);
-		}
-
-		return $file;
-	}
-
-	/**
-	 * Returns the user display name.
-	 *
-	 * @return string
-	 */
-	public function getDisplayName(): string {
-		return $this->user->getDisplayName();
-	}
-
-	/**
-	 * Handles user changes.
-	 *
-	 * @param string $feature The changed feature
-	 * @param mixed $oldValue The previous value
-	 * @param mixed $newValue The new value
-	 * @throws NotPermittedException
-	 * @throws \OCP\PreConditionNotMetException
-	 */
-	public function userChanged($feature, $oldValue, $newValue) {
-		// We only change the avatar on display name changes
-		if ($feature !== 'displayName') {
-			return;
-		}
-
-		// If the avatar is not generated (so an uploaded image) we skip this
-		if (!$this->folder->fileExists('generated')) {
-			return;
-		}
-
-		$this->remove();
-	}
-
-	/**
-	 * Check if the avatar of a user is a custom uploaded one
-	 *
-	 * @return bool
-	 */
-	public function isCustomAvatar(): bool {
-		return $this->config->getUserValue($this->user->getUID(), 'avatar', 'generated', 'false') !== 'true';
-	}
+    /** @var IConfig */
+    private $config;
+
+    /** @var ISimpleFolder */
+    private $folder;
+
+    /** @var IL10N */
+    private $l;
+
+    /** @var User */
+    private $user;
+
+    /**
+     * UserAvatar constructor.
+     *
+     * @param IConfig $config The configuration
+     * @param ISimpleFolder $folder The avatar files folder
+     * @param IL10N $l The localization helper
+     * @param User $user The user this class manages the avatar for
+     * @param ILogger $logger The logger
+     */
+    public function __construct(
+        ISimpleFolder $folder,
+        IL10N $l,
+        $user,
+        ILogger $logger,
+        IConfig $config) {
+        parent::__construct($logger);
+        $this->folder = $folder;
+        $this->l = $l;
+        $this->user = $user;
+        $this->config = $config;
+    }
+
+    /**
+     * Check if an avatar exists for the user
+     *
+     * @return bool
+     */
+    public function exists() {
+        return $this->folder->fileExists('avatar.jpg') || $this->folder->fileExists('avatar.png');
+    }
+
+    /**
+     * Sets the users avatar.
+     *
+     * @param IImage|resource|string $data An image object, imagedata or path to set a new avatar
+     * @throws \Exception if the provided file is not a jpg or png image
+     * @throws \Exception if the provided image is not valid
+     * @throws NotSquareException if the image is not square
+     * @return void
+     */
+    public function set($data) {
+        $img = $this->getAvatarImage($data);
+        $data = $img->data();
+
+        $this->validateAvatar($img);
+
+        $this->remove();
+        $type = $this->getAvatarImageType($img);
+        $file = $this->folder->newFile('avatar.' . $type);
+        $file->putContent($data);
+
+        try {
+            $generated = $this->folder->getFile('generated');
+            $this->config->setUserValue($this->user->getUID(), 'avatar', 'generated', 'false');
+            $generated->delete();
+        } catch (NotFoundException $e) {
+            //
+        }
+
+        $this->user->triggerChange('avatar', $file);
+    }
+
+    /**
+     * Returns an image from several sources.
+     *
+     * @param IImage|resource|string $data An image object, imagedata or path to the avatar
+     * @return IImage
+     */
+    private function getAvatarImage($data) {
+        if ($data instanceof IImage) {
+            return $data;
+        }
+
+        $img = new OC_Image();
+        if (is_resource($data) && get_resource_type($data) === 'gd') {
+            $img->setResource($data);
+        } elseif (is_resource($data)) {
+            $img->loadFromFileHandle($data);
+        } else {
+            try {
+                // detect if it is a path or maybe the images as string
+                $result = @realpath($data);
+                if ($result === false || $result === null) {
+                    $img->loadFromData($data);
+                } else {
+                    $img->loadFromFile($data);
+                }
+            } catch (\Error $e) {
+                $img->loadFromData($data);
+            }
+        }
+
+        return $img;
+    }
+
+    /**
+     * Returns the avatar image type.
+     *
+     * @param IImage $avatar
+     * @return string
+     */
+    private function getAvatarImageType(IImage $avatar) {
+        $type = substr($avatar->mimeType(), -3);
+        if ($type === 'peg') {
+            $type = 'jpg';
+        }
+        return $type;
+    }
+
+    /**
+     * Validates an avatar image:
+     * - must be "png" or "jpg"
+     * - must be "valid"
+     * - must be in square format
+     *
+     * @param IImage $avatar The avatar to validate
+     * @throws \Exception if the provided file is not a jpg or png image
+     * @throws \Exception if the provided image is not valid
+     * @throws NotSquareException if the image is not square
+     */
+    private function validateAvatar(IImage $avatar) {
+        $type = $this->getAvatarImageType($avatar);
+
+        if ($type !== 'jpg' && $type !== 'png') {
+            throw new \Exception($this->l->t('Unknown filetype'));
+        }
+
+        if (!$avatar->valid()) {
+            throw new \Exception($this->l->t('Invalid image'));
+        }
+
+        if (!($avatar->height() === $avatar->width())) {
+            throw new NotSquareException($this->l->t('Avatar image is not square'));
+        }
+    }
+
+    /**
+     * Removes the users avatar.
+     * @return void
+     * @throws \OCP\Files\NotPermittedException
+     * @throws \OCP\PreConditionNotMetException
+     */
+    public function remove() {
+        $avatars = $this->folder->getDirectoryListing();
+
+        $this->config->setUserValue($this->user->getUID(), 'avatar', 'version',
+            (int) $this->config->getUserValue($this->user->getUID(), 'avatar', 'version', 0) + 1);
+
+        foreach ($avatars as $avatar) {
+            $avatar->delete();
+        }
+        $this->config->setUserValue($this->user->getUID(), 'avatar', 'generated', 'true');
+        $this->user->triggerChange('avatar', '');
+    }
+
+    /**
+     * Get the extension of the avatar. If there is no avatar throw Exception
+     *
+     * @return string
+     * @throws NotFoundException
+     */
+    private function getExtension() {
+        if ($this->folder->fileExists('avatar.jpg')) {
+            return 'jpg';
+        } elseif ($this->folder->fileExists('avatar.png')) {
+            return 'png';
+        }
+        throw new NotFoundException;
+    }
+
+    /**
+     * Returns the avatar for an user.
+     *
+     * If there is no avatar file yet, one is generated.
+     *
+     * @param int $size
+     * @return ISimpleFile
+     * @throws NotFoundException
+     * @throws \OCP\Files\NotPermittedException
+     * @throws \OCP\PreConditionNotMetException
+     */
+    public function getFile($size) {
+        $size = (int) $size;
+
+        try {
+            $ext = $this->getExtension();
+        } catch (NotFoundException $e) {
+            if (!$data = $this->generateAvatarFromSvg(1024)) {
+                $data = $this->generateAvatar($this->getDisplayName(), 1024);
+            }
+            $avatar = $this->folder->newFile('avatar.png');
+            $avatar->putContent($data);
+            $ext = 'png';
+
+            $this->folder->newFile('generated');
+            $this->config->setUserValue($this->user->getUID(), 'avatar', 'generated', 'true');
+        }
+
+        if ($size === -1) {
+            $path = 'avatar.' . $ext;
+        } else {
+            $path = 'avatar.' . $size . '.' . $ext;
+        }
+
+        try {
+            $file = $this->folder->getFile($path);
+        } catch (NotFoundException $e) {
+            if ($size <= 0) {
+                throw new NotFoundException;
+            }
+
+            if ($this->folder->fileExists('generated')) {
+                if (!$data = $this->generateAvatarFromSvg($size)) {
+                    $data = $this->generateAvatar($this->getDisplayName(), $size);
+                }
+
+            } else {
+                $avatar = new OC_Image();
+                $file = $this->folder->getFile('avatar.' . $ext);
+                $avatar->loadFromData($file->getContent());
+                $avatar->resize($size);
+                $data = $avatar->data();
+            }
+
+            try {
+                $file = $this->folder->newFile($path);
+                $file->putContent($data);
+            } catch (NotPermittedException $e) {
+                $this->logger->error('Failed to save avatar for ' . $this->user->getUID());
+                throw new NotFoundException();
+            }
+
+        }
+
+        if ($this->config->getUserValue($this->user->getUID(), 'avatar', 'generated', null) === null) {
+            $generated = $this->folder->fileExists('generated') ? 'true' : 'false';
+            $this->config->setUserValue($this->user->getUID(), 'avatar', 'generated', $generated);
+        }
+
+        return $file;
+    }
+
+    /**
+     * Returns the user display name.
+     *
+     * @return string
+     */
+    public function getDisplayName(): string {
+        return $this->user->getDisplayName();
+    }
+
+    /**
+     * Handles user changes.
+     *
+     * @param string $feature The changed feature
+     * @param mixed $oldValue The previous value
+     * @param mixed $newValue The new value
+     * @throws NotPermittedException
+     * @throws \OCP\PreConditionNotMetException
+     */
+    public function userChanged($feature, $oldValue, $newValue) {
+        // We only change the avatar on display name changes
+        if ($feature !== 'displayName') {
+            return;
+        }
+
+        // If the avatar is not generated (so an uploaded image) we skip this
+        if (!$this->folder->fileExists('generated')) {
+            return;
+        }
+
+        $this->remove();
+    }
+
+    /**
+     * Check if the avatar of a user is a custom uploaded one
+     *
+     * @return bool
+     */
+    public function isCustomAvatar(): bool {
+        return $this->config->getUserValue($this->user->getUID(), 'avatar', 'generated', 'false') !== 'true';
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -99,7 +99,7 @@ 
 
 		$this->remove();
 		$type = $this->getAvatarImageType($img);
-		$file = $this->folder->newFile('avatar.' . $type);
+		$file = $this->folder->newFile('avatar.'.$type);
 		$file->putContent($data);
 
 		try {
@@ -250,9 +250,9 @@ 
 		}
 
 		if ($size === -1) {
-			$path = 'avatar.' . $ext;
+			$path = 'avatar.'.$ext;
 		} else {
-			$path = 'avatar.' . $size . '.' . $ext;
+			$path = 'avatar.'.$size.'.'.$ext;
 		}
 
 		try {
@@ -269,7 +269,7 @@ 
 
 			} else {
 				$avatar = new OC_Image();
-				$file = $this->folder->getFile('avatar.' . $ext);
+				$file = $this->folder->getFile('avatar.'.$ext);
 				$avatar->loadFromData($file->getContent());
 				$avatar->resize($size);
 				$data = $avatar->data();
@@ -279,7 +279,7 @@ 
 				$file = $this->folder->newFile($path);
 				$file->putContent($data);
 			} catch (NotPermittedException $e) {
-				$this->logger->error('Failed to save avatar for ' . $this->user->getUID());
+				$this->logger->error('Failed to save avatar for '.$this->user->getUID());
 				throw new NotFoundException();
 			}
 

lib/private/Avatar/GuestAvatar.php

Indentation +78 added lines, -78 removed lines

@@ -30,90 +30,90 @@
  * This class represents a guest user's avatar.
  */
 class GuestAvatar extends Avatar {
-	/**
-	 * Holds the guest user display name.
-	 *
-	 * @var string
-	 */
-	private $userDisplayName;
+    /**
+     * Holds the guest user display name.
+     *
+     * @var string
+     */
+    private $userDisplayName;
 
-	/**
-	 * GuestAvatar constructor.
-	 *
-	 * @param string $userDisplayName The guest user display name
-	 * @param ILogger $logger The logger
-	 */
-	public function __construct(string $userDisplayName, ILogger $logger) {
-		parent::__construct($logger);
-		$this->userDisplayName = $userDisplayName;
-	}
+    /**
+     * GuestAvatar constructor.
+     *
+     * @param string $userDisplayName The guest user display name
+     * @param ILogger $logger The logger
+     */
+    public function __construct(string $userDisplayName, ILogger $logger) {
+        parent::__construct($logger);
+        $this->userDisplayName = $userDisplayName;
+    }
 
-	/**
-	 * Tests if the user has an avatar.
-	 *
-	 * @return true Guests always have an avatar.
-	 */
-	public function exists() {
-		return true;
-	}
+    /**
+     * Tests if the user has an avatar.
+     *
+     * @return true Guests always have an avatar.
+     */
+    public function exists() {
+        return true;
+    }
 
-	/**
-	 * Returns the guest user display name.
-	 *
-	 * @return string
-	 */
-	public function getDisplayName(): string {
-		return $this->userDisplayName;
-	}
+    /**
+     * Returns the guest user display name.
+     *
+     * @return string
+     */
+    public function getDisplayName(): string {
+        return $this->userDisplayName;
+    }
 
-	/**
-	 * Setting avatars isn't implemented for guests.
-	 *
-	 * @param \OCP\IImage|resource|string $data
-	 * @return void
-	 */
-	public function set($data) {
-		// unimplemented for guest user avatars
-	}
+    /**
+     * Setting avatars isn't implemented for guests.
+     *
+     * @param \OCP\IImage|resource|string $data
+     * @return void
+     */
+    public function set($data) {
+        // unimplemented for guest user avatars
+    }
 
-	/**
-	 * Removing avatars isn't implemented for guests.
-	 */
-	public function remove() {
-		// unimplemented for guest user avatars
-	}
+    /**
+     * Removing avatars isn't implemented for guests.
+     */
+    public function remove() {
+        // unimplemented for guest user avatars
+    }
 
-	/**
-	 * Generates an avatar for the guest.
-	 *
-	 * @param int $size The desired image size.
-	 * @return InMemoryFile
-	 */
-	public function getFile($size) {
-		$avatar = $this->generateAvatar($this->userDisplayName, $size);
-		return new InMemoryFile('avatar.png', $avatar);
-	}
+    /**
+     * Generates an avatar for the guest.
+     *
+     * @param int $size The desired image size.
+     * @return InMemoryFile
+     */
+    public function getFile($size) {
+        $avatar = $this->generateAvatar($this->userDisplayName, $size);
+        return new InMemoryFile('avatar.png', $avatar);
+    }
 
-	/**
-	 * Updates the display name if changed.
-	 *
-	 * @param string $feature The changed feature
-	 * @param mixed $oldValue The previous value
-	 * @param mixed $newValue The new value
-	 * @return void
-	 */
-	public function userChanged($feature, $oldValue, $newValue) {
-		if ($feature === 'displayName') {
-			$this->userDisplayName = $newValue;
-		}
-	}
+    /**
+     * Updates the display name if changed.
+     *
+     * @param string $feature The changed feature
+     * @param mixed $oldValue The previous value
+     * @param mixed $newValue The new value
+     * @return void
+     */
+    public function userChanged($feature, $oldValue, $newValue) {
+        if ($feature === 'displayName') {
+            $this->userDisplayName = $newValue;
+        }
+    }
 
-	/**
-	 * Guests don't have custom avatars.
-	 *
-	 * @return bool
-	 */
-	public function isCustomAvatar(): bool {
-		return false;
-	}
+    /**
+     * Guests don't have custom avatars.
+     *
+     * @return bool
+     */
+    public function isCustomAvatar(): bool {
+        return false;
+    }
 }

lib/private/Avatar/AvatarManager.php

Indentation +77 added lines, -77 removed lines

@@ -42,92 +42,92 @@
  */
 class AvatarManager implements IAvatarManager {
 
-	/** @var Manager */
-	private $userManager;
+    /** @var Manager */
+    private $userManager;
 
-	/** @var IAppData */
-	private $appData;
+    /** @var IAppData */
+    private $appData;
 
-	/** @var IL10N */
-	private $l;
+    /** @var IL10N */
+    private $l;
 
-	/** @var ILogger  */
-	private $logger;
+    /** @var ILogger  */
+    private $logger;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * AvatarManager constructor.
-	 *
-	 * @param Manager $userManager
-	 * @param IAppData $appData
-	 * @param IL10N $l
-	 * @param ILogger $logger
-	 * @param IConfig $config
-	 */
-	public function __construct(
-			Manager $userManager,
-			IAppData $appData,
-			IL10N $l,
-			ILogger $logger,
-			IConfig $config) {
-		$this->userManager = $userManager;
-		$this->appData = $appData;
-		$this->l = $l;
-		$this->logger = $logger;
-		$this->config = $config;
-	}
+    /**
+     * AvatarManager constructor.
+     *
+     * @param Manager $userManager
+     * @param IAppData $appData
+     * @param IL10N $l
+     * @param ILogger $logger
+     * @param IConfig $config
+     */
+    public function __construct(
+            Manager $userManager,
+            IAppData $appData,
+            IL10N $l,
+            ILogger $logger,
+            IConfig $config) {
+        $this->userManager = $userManager;
+        $this->appData = $appData;
+        $this->l = $l;
+        $this->logger = $logger;
+        $this->config = $config;
+    }
 
-	/**
-	 * return a user specific instance of \OCP\IAvatar
-	 * @see \OCP\IAvatar
-	 * @param string $userId the ownCloud user id
-	 * @return \OCP\IAvatar
-	 * @throws \Exception In case the username is potentially dangerous
-	 * @throws NotFoundException In case there is no user folder yet
-	 */
-	public function getAvatar(string $userId) : IAvatar {
-		$user = $this->userManager->get($userId);
-		if ($user === null) {
-			throw new \Exception('user does not exist');
-		}
+    /**
+     * return a user specific instance of \OCP\IAvatar
+     * @see \OCP\IAvatar
+     * @param string $userId the ownCloud user id
+     * @return \OCP\IAvatar
+     * @throws \Exception In case the username is potentially dangerous
+     * @throws NotFoundException In case there is no user folder yet
+     */
+    public function getAvatar(string $userId) : IAvatar {
+        $user = $this->userManager->get($userId);
+        if ($user === null) {
+            throw new \Exception('user does not exist');
+        }
 
-		// sanitize userID - fixes casing issue (needed for the filesystem stuff that is done below)
-		$userId = $user->getUID();
+        // sanitize userID - fixes casing issue (needed for the filesystem stuff that is done below)
+        $userId = $user->getUID();
 
-		try {
-			$folder = $this->appData->getFolder($userId);
-		} catch (NotFoundException $e) {
-			$folder = $this->appData->newFolder($userId);
-		}
+        try {
+            $folder = $this->appData->getFolder($userId);
+        } catch (NotFoundException $e) {
+            $folder = $this->appData->newFolder($userId);
+        }
 
-		return new UserAvatar($folder, $this->l, $user, $this->logger, $this->config);
-	}
+        return new UserAvatar($folder, $this->l, $user, $this->logger, $this->config);
+    }
 
-	/**
-	 * Clear generated avatars
-	 */
-	public function clearCachedAvatars() {
-		$users = $this->config->getUsersForUserValue('avatar', 'generated', 'true');
-		foreach($users as $userId) {
-			try {
-				$folder = $this->appData->getFolder($userId);
-				$folder->delete();
-			} catch (NotFoundException $e) {
-				$this->logger->debug("No cache for the user $userId. Ignoring...");
-			}
-			$this->config->setUserValue($userId, 'avatar', 'generated', 'false');
-		}
-	}
+    /**
+     * Clear generated avatars
+     */
+    public function clearCachedAvatars() {
+        $users = $this->config->getUsersForUserValue('avatar', 'generated', 'true');
+        foreach($users as $userId) {
+            try {
+                $folder = $this->appData->getFolder($userId);
+                $folder->delete();
+            } catch (NotFoundException $e) {
+                $this->logger->debug("No cache for the user $userId. Ignoring...");
+            }
+            $this->config->setUserValue($userId, 'avatar', 'generated', 'false');
+        }
+    }
 
-	/**
-	 * Returns a GuestAvatar.
-	 *
-	 * @param string $name The guest name, e.g. "Albert".
-	 * @return IAvatar
-	 */
-	public function getGuestAvatar(string $name): IAvatar {
-		return new GuestAvatar($name, $this->logger);
-	}
+    /**
+     * Returns a GuestAvatar.
+     *
+     * @param string $name The guest name, e.g. "Albert".
+     * @return IAvatar
+     */
+    public function getGuestAvatar(string $name): IAvatar {
+        return new GuestAvatar($name, $this->logger);
+    }
 }

core/routes.php

Indentation +98 added lines, -98 removed lines

@@ -36,53 +36,53 @@ 
 
 $application = new Application();
 $application->registerRoutes($this, [
-	'routes' => [
-		['name' => 'lost#email', 'url' => '/lostpassword/email', 'verb' => 'POST'],
-		['name' => 'lost#resetform', 'url' => '/lostpassword/reset/form/{token}/{userId}', 'verb' => 'GET'],
-		['name' => 'lost#setPassword', 'url' => '/lostpassword/set/{token}/{userId}', 'verb' => 'POST'],
-		['name' => 'user#getDisplayNames', 'url' => '/displaynames', 'verb' => 'POST'],
-		['name' => 'avatar#getAvatar', 'url' => '/avatar/{userId}/{size}', 'verb' => 'GET'],
-		['name' => 'avatar#deleteAvatar', 'url' => '/avatar/', 'verb' => 'DELETE'],
-		['name' => 'avatar#postCroppedAvatar', 'url' => '/avatar/cropped', 'verb' => 'POST'],
-		['name' => 'avatar#getTmpAvatar', 'url' => '/avatar/tmp', 'verb' => 'GET'],
-		['name' => 'avatar#postAvatar', 'url' => '/avatar/', 'verb' => 'POST'],
-		['name' => 'GuestAvatar#getAvatar', 'url' => '/avatar/guest/{guestName}/{size}', 'verb' => 'GET'],
-		['name' => 'CSRFToken#index', 'url' => '/csrftoken', 'verb' => 'GET'],
-		['name' => 'login#tryLogin', 'url' => '/login', 'verb' => 'POST'],
-		['name' => 'login#confirmPassword', 'url' => '/login/confirm', 'verb' => 'POST'],
-		['name' => 'login#showLoginForm', 'url' => '/login', 'verb' => 'GET'],
-		['name' => 'login#logout', 'url' => '/logout', 'verb' => 'GET'],
-		['name' => 'ClientFlowLogin#showAuthPickerPage', 'url' => '/login/flow', 'verb' => 'GET'],
-		['name' => 'ClientFlowLogin#generateAppPassword', 'url' => '/login/flow', 'verb' => 'POST'],
-		['name' => 'ClientFlowLogin#grantPage', 'url' => '/login/flow/grant', 'verb' => 'GET'],
-		['name' => 'ClientFlowLogin#apptokenRedirect', 'url' => '/login/flow/apptoken', 'verb' => 'POST'],
-		['name' => 'TwoFactorChallenge#selectChallenge', 'url' => '/login/selectchallenge', 'verb' => 'GET'],
-		['name' => 'TwoFactorChallenge#showChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'GET'],
-		['name' => 'TwoFactorChallenge#solveChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'POST'],
-		['name' => 'OCJS#getConfig', 'url' => '/core/js/oc.js', 'verb' => 'GET'],
-		['name' => 'Preview#getPreviewByFileId', 'url' => '/core/preview', 'verb' => 'GET'],
-		['name' => 'Preview#getPreview', 'url' => '/core/preview.png', 'verb' => 'GET'],
-		['name' => 'Svg#getSvgFromCore', 'url' => '/svg/core/{folder}/{fileName}', 'verb' => 'GET'],
-		['name' => 'Svg#getSvgFromApp', 'url' => '/svg/{app}/{fileName}', 'verb' => 'GET'],
-		['name' => 'Css#getCss', 'url' => '/css/{appName}/{fileName}', 'verb' => 'GET'],
-		['name' => 'Js#getJs', 'url' => '/js/{appName}/{fileName}', 'verb' => 'GET'],
-		['name' => 'contactsMenu#index', 'url' => '/contactsmenu/contacts', 'verb' => 'POST'],
-		['name' => 'contactsMenu#findOne', 'url' => '/contactsmenu/findOne', 'verb' => 'POST'],
-		['name' => 'WalledGarden#get', 'url' => '/204', 'verb' => 'GET'],
-		['name' => 'Search#search', 'url' => '/core/search', 'verb' => 'GET'],
-	],
-	'ocs' => [
-		['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'],
-		['root' => '', 'name' => 'OCS#getConfig', 'url' => '/config', 'verb' => 'GET'],
-		['root' => '/person', 'name' => 'OCS#personCheck', 'url' => '/check', 'verb' => 'POST'],
-		['root' => '/identityproof', 'name' => 'OCS#getIdentityProof', 'url' => '/key/{cloudId}', 'verb' => 'GET'],
-		['root' => '/core', 'name' => 'Navigation#getAppsNavigation', 'url' => '/navigation/apps', 'verb' => 'GET'],
-		['root' => '/core', 'name' => 'Navigation#getSettingsNavigation', 'url' => '/navigation/settings', 'verb' => 'GET'],
-		['root' => '/core', 'name' => 'AutoComplete#get', 'url' => '/autocomplete/get', 'verb' => 'GET'],
-		['root' => '/core', 'name' => 'WhatsNew#get', 'url' => '/whatsnew', 'verb' => 'GET'],
-		['root' => '/core', 'name' => 'WhatsNew#dismiss', 'url' => '/whatsnew', 'verb' => 'POST'],
-		['root' => '/core', 'name' => 'AppPassword#getAppPassword', 'url' => '/getapppassword', 'verb' => 'GET'],
-	],
+    'routes' => [
+        ['name' => 'lost#email', 'url' => '/lostpassword/email', 'verb' => 'POST'],
+        ['name' => 'lost#resetform', 'url' => '/lostpassword/reset/form/{token}/{userId}', 'verb' => 'GET'],
+        ['name' => 'lost#setPassword', 'url' => '/lostpassword/set/{token}/{userId}', 'verb' => 'POST'],
+        ['name' => 'user#getDisplayNames', 'url' => '/displaynames', 'verb' => 'POST'],
+        ['name' => 'avatar#getAvatar', 'url' => '/avatar/{userId}/{size}', 'verb' => 'GET'],
+        ['name' => 'avatar#deleteAvatar', 'url' => '/avatar/', 'verb' => 'DELETE'],
+        ['name' => 'avatar#postCroppedAvatar', 'url' => '/avatar/cropped', 'verb' => 'POST'],
+        ['name' => 'avatar#getTmpAvatar', 'url' => '/avatar/tmp', 'verb' => 'GET'],
+        ['name' => 'avatar#postAvatar', 'url' => '/avatar/', 'verb' => 'POST'],
+        ['name' => 'GuestAvatar#getAvatar', 'url' => '/avatar/guest/{guestName}/{size}', 'verb' => 'GET'],
+        ['name' => 'CSRFToken#index', 'url' => '/csrftoken', 'verb' => 'GET'],
+        ['name' => 'login#tryLogin', 'url' => '/login', 'verb' => 'POST'],
+        ['name' => 'login#confirmPassword', 'url' => '/login/confirm', 'verb' => 'POST'],
+        ['name' => 'login#showLoginForm', 'url' => '/login', 'verb' => 'GET'],
+        ['name' => 'login#logout', 'url' => '/logout', 'verb' => 'GET'],
+        ['name' => 'ClientFlowLogin#showAuthPickerPage', 'url' => '/login/flow', 'verb' => 'GET'],
+        ['name' => 'ClientFlowLogin#generateAppPassword', 'url' => '/login/flow', 'verb' => 'POST'],
+        ['name' => 'ClientFlowLogin#grantPage', 'url' => '/login/flow/grant', 'verb' => 'GET'],
+        ['name' => 'ClientFlowLogin#apptokenRedirect', 'url' => '/login/flow/apptoken', 'verb' => 'POST'],
+        ['name' => 'TwoFactorChallenge#selectChallenge', 'url' => '/login/selectchallenge', 'verb' => 'GET'],
+        ['name' => 'TwoFactorChallenge#showChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'GET'],
+        ['name' => 'TwoFactorChallenge#solveChallenge', 'url' => '/login/challenge/{challengeProviderId}', 'verb' => 'POST'],
+        ['name' => 'OCJS#getConfig', 'url' => '/core/js/oc.js', 'verb' => 'GET'],
+        ['name' => 'Preview#getPreviewByFileId', 'url' => '/core/preview', 'verb' => 'GET'],
+        ['name' => 'Preview#getPreview', 'url' => '/core/preview.png', 'verb' => 'GET'],
+        ['name' => 'Svg#getSvgFromCore', 'url' => '/svg/core/{folder}/{fileName}', 'verb' => 'GET'],
+        ['name' => 'Svg#getSvgFromApp', 'url' => '/svg/{app}/{fileName}', 'verb' => 'GET'],
+        ['name' => 'Css#getCss', 'url' => '/css/{appName}/{fileName}', 'verb' => 'GET'],
+        ['name' => 'Js#getJs', 'url' => '/js/{appName}/{fileName}', 'verb' => 'GET'],
+        ['name' => 'contactsMenu#index', 'url' => '/contactsmenu/contacts', 'verb' => 'POST'],
+        ['name' => 'contactsMenu#findOne', 'url' => '/contactsmenu/findOne', 'verb' => 'POST'],
+        ['name' => 'WalledGarden#get', 'url' => '/204', 'verb' => 'GET'],
+        ['name' => 'Search#search', 'url' => '/core/search', 'verb' => 'GET'],
+    ],
+    'ocs' => [
+        ['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'],
+        ['root' => '', 'name' => 'OCS#getConfig', 'url' => '/config', 'verb' => 'GET'],
+        ['root' => '/person', 'name' => 'OCS#personCheck', 'url' => '/check', 'verb' => 'POST'],
+        ['root' => '/identityproof', 'name' => 'OCS#getIdentityProof', 'url' => '/key/{cloudId}', 'verb' => 'GET'],
+        ['root' => '/core', 'name' => 'Navigation#getAppsNavigation', 'url' => '/navigation/apps', 'verb' => 'GET'],
+        ['root' => '/core', 'name' => 'Navigation#getSettingsNavigation', 'url' => '/navigation/settings', 'verb' => 'GET'],
+        ['root' => '/core', 'name' => 'AutoComplete#get', 'url' => '/autocomplete/get', 'verb' => 'GET'],
+        ['root' => '/core', 'name' => 'WhatsNew#get', 'url' => '/whatsnew', 'verb' => 'GET'],
+        ['root' => '/core', 'name' => 'WhatsNew#dismiss', 'url' => '/whatsnew', 'verb' => 'POST'],
+        ['root' => '/core', 'name' => 'AppPassword#getAppPassword', 'url' => '/getapppassword', 'verb' => 'GET'],
+    ],
 ]);
 
 // Post installation check
@@ -91,12 +91,12 @@ 
 // Core ajax actions
 // Routing
 $this->create('core_ajax_update', '/core/ajax/update.php')
-	->actionInclude('core/ajax/update.php');
+    ->actionInclude('core/ajax/update.php');
 
 // File routes
 $this->create('files.viewcontroller.showFile', '/f/{fileid}')->action(function($urlParams) {
-	$app = new \OCA\Files\AppInfo\Application($urlParams);
-	$app->dispatch('ViewController', 'index');
+    $app = new \OCA\Files\AppInfo\Application($urlParams);
+    $app->dispatch('ViewController', 'index');
 });
 
 // Call routes
@@ -105,12 +105,12 @@ 
  * @suppress PhanUndeclaredClassMethod
  */
 $this->create('spreed.pagecontroller.showCall', '/call/{token}')->action(function($urlParams) {
-	if (class_exists(\OCA\Spreed\AppInfo\Application::class, false)) {
-		$app = new \OCA\Spreed\AppInfo\Application($urlParams);
-		$app->dispatch('PageController', 'index');
-	} else {
-		throw new \OC\HintException('App spreed is not enabled');
-	}
+    if (class_exists(\OCA\Spreed\AppInfo\Application::class, false)) {
+        $app = new \OCA\Spreed\AppInfo\Application($urlParams);
+        $app->dispatch('PageController', 'index');
+    } else {
+        throw new \OC\HintException('App spreed is not enabled');
+    }
 });
 
 // OCM routes
@@ -119,12 +119,12 @@ 
  * @suppress PhanUndeclaredClassMethod
  */
 $this->create('cloud_federation_api.requesthandlercontroller.addShare', '/ocm/shares')->post()->action(function($urlParams) {
-	if (class_exists(\OCA\CloudFederationAPI\AppInfo\Application::class, false)) {
-		$app = new \OCA\CloudFederationAPI\AppInfo\Application($urlParams);
-		$app->dispatch('RequestHandlerController', 'addShare');
-	} else {
-		throw new \OC\HintException('Cloud Federation API not enabled');
-	}
+    if (class_exists(\OCA\CloudFederationAPI\AppInfo\Application::class, false)) {
+        $app = new \OCA\CloudFederationAPI\AppInfo\Application($urlParams);
+        $app->dispatch('RequestHandlerController', 'addShare');
+    } else {
+        throw new \OC\HintException('Cloud Federation API not enabled');
+    }
 });
 
 /**
@@ -132,53 +132,53 @@ 
  * @suppress PhanUndeclaredClassMethod
  */
 $this->create('cloud_federation_api.requesthandlercontroller.receiveNotification', '/ocm/notifications')->post()->action(function($urlParams) {
-	if (class_exists(\OCA\CloudFederationAPI\AppInfo\Application::class, false)) {
-		$app = new \OCA\CloudFederationAPI\AppInfo\Application($urlParams);
-		$app->dispatch('RequestHandlerController', 'receiveNotification');
-	} else {
-		throw new \OC\HintException('Cloud Federation API not enabled');
-	}
+    if (class_exists(\OCA\CloudFederationAPI\AppInfo\Application::class, false)) {
+        $app = new \OCA\CloudFederationAPI\AppInfo\Application($urlParams);
+        $app->dispatch('RequestHandlerController', 'receiveNotification');
+    } else {
+        throw new \OC\HintException('Cloud Federation API not enabled');
+    }
 });
 
 
 // Sharing routes
 $this->create('files_sharing.sharecontroller.showShare', '/s/{token}')->action(function($urlParams) {
-	if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
-		$app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
-		$app->dispatch('ShareController', 'showShare');
-	} else {
-		throw new \OC\HintException('App file sharing is not enabled');
-	}
+    if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
+        $app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
+        $app->dispatch('ShareController', 'showShare');
+    } else {
+        throw new \OC\HintException('App file sharing is not enabled');
+    }
 });
 $this->create('files_sharing.sharecontroller.authenticate', '/s/{token}/authenticate/{redirect}')->post()->action(function($urlParams) {
-	if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
-		$app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
-		$app->dispatch('ShareController', 'authenticate');
-	} else {
-		throw new \OC\HintException('App file sharing is not enabled');
-	}
+    if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
+        $app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
+        $app->dispatch('ShareController', 'authenticate');
+    } else {
+        throw new \OC\HintException('App file sharing is not enabled');
+    }
 });
 $this->create('files_sharing.sharecontroller.showAuthenticate', '/s/{token}/authenticate/{redirect}')->get()->action(function($urlParams) {
-	if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
-		$app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
-		$app->dispatch('ShareController', 'showAuthenticate');
-	} else {
-		throw new \OC\HintException('App file sharing is not enabled');
-	}
+    if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
+        $app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
+        $app->dispatch('ShareController', 'showAuthenticate');
+    } else {
+        throw new \OC\HintException('App file sharing is not enabled');
+    }
 });
 $this->create('files_sharing.sharecontroller.downloadShare', '/s/{token}/download')->get()->action(function($urlParams) {
-	if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
-		$app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
-		$app->dispatch('ShareController', 'downloadShare');
-	} else {
-		throw new \OC\HintException('App file sharing is not enabled');
-	}
+    if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
+        $app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
+        $app->dispatch('ShareController', 'downloadShare');
+    } else {
+        throw new \OC\HintException('App file sharing is not enabled');
+    }
 });
 $this->create('files_sharing.publicpreview.directLink', '/s/{token}/preview')->get()->action(function($urlParams) {
-	if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
-		$app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
-		$app->dispatch('PublicPreviewController', 'directLink');
-	} else {
-		throw new \OC\HintException('App file sharing is not enabled');
-	}
+    if (class_exists(\OCA\Files_Sharing\AppInfo\Application::class, false)) {
+        $app = new \OCA\Files_Sharing\AppInfo\Application($urlParams);
+        $app->dispatch('PublicPreviewController', 'directLink');
+    } else {
+        throw new \OC\HintException('App file sharing is not enabled');
+    }
 });

core/Controller/GuestAvatarController.php

Indentation +64 added lines, -64 removed lines

@@ -33,75 +33,75 @@
  */
 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;
 
-		// min/max size
-		if ($size > 2048) {
-			$size = 2048;
-		} elseif ($size <= 0) {
-			$size = 64;
-		}
+        // min/max size
+        if ($size > 2048) {
+            $size = 2048;
+        } elseif ($size <= 0) {
+            $size = 64;
+        }
 
-		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;
+    }
 }