nextcloud / server

lib/private/Avatar.php

Braces +1 added lines, -1 removed lines

@@ -230,7 +230,7 @@
 			$r = $l;
 			$g = $l;
 			$b = $l; // achromatic
-		}else{
+		} else{
 			$q = $l < 0.5 ? $l * (1 + $s) : $l + $s - $l * $s;
 			$p = 2 * $l - $q;
 			$r = $hue2rgb($p, $q, $h + 1/3);

Doc Comments +3 added lines, -3 removed lines

@@ -268,7 +268,7 @@ 
 	 * @param int $r
 	 * @param int $g
 	 * @param int $b
-	 * @return double[] Array containing h s l in [0, 1] range
+	 * @return double Array containing h s l in [0, 1] range
 	 */
 	private function rgbToHsl($r, $g, $b) {
 		$r /= 255.0;
@@ -306,7 +306,7 @@ 
 
 	/**
 	 * @param string $text
-	 * @return int[] Array containting r g b in the range [0, 255]
+	 * @return double[] Array containting r g b in the range [0, 255]
 	 */
 	private function avatarBackgroundColor($text) {
 		$hash = preg_replace('/[^0-9a-f]+/', '', $text);
@@ -355,7 +355,7 @@ 
 	 * @param double $h Hue in range [0, 1]
 	 * @param double $s Saturation in range [0, 1]
 	 * @param double $l Lightness in range [0, 1]
-	 * @return int[] Array containing r g b in the range [0, 255]
+	 * @return double[] Array containing r g b in the range [0, 255]
 	 */
 	private function hslToRgb($h, $s, $l){
 		$hue2rgb = function ($p, $q, $t){

Indentation +346 added lines, -346 removed lines

@@ -46,351 +46,351 @@
  */
 
 class Avatar implements IAvatar {
-	/** @var ISimpleFolder */
-	private $folder;
-	/** @var IL10N */
-	private $l;
-	/** @var User */
-	private $user;
-	/** @var ILogger  */
-	private $logger;
-	/** @var IConfig */
-	private $config;
-
-	/**
-	 * constructor
-	 *
-	 * @param ISimpleFolder $folder The folder where the avatars are
-	 * @param IL10N $l
-	 * @param User $user
-	 * @param ILogger $logger
-	 * @param IConfig $config
-	 */
-	public function __construct(ISimpleFolder $folder,
-								IL10N $l,
-								$user,
-								ILogger $logger,
-								IConfig $config) {
-		$this->folder = $folder;
-		$this->l = $l;
-		$this->user = $user;
-		$this->logger = $logger;
-		$this->config = $config;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function get ($size = 64) {
-		try {
-			$file = $this->getFile($size);
-		} catch (NotFoundException $e) {
-			return false;
-		}
-
-		$avatar = new OC_Image();
-		$avatar->loadFromData($file->getContent());
-		return $avatar;
-	}
-
-	/**
-	 * 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) {
-
-		if($data instanceOf IImage) {
-			$img = $data;
-			$data = $img->data();
-		} else {
-			$img = new OC_Image($data);
-		}
-		$type = substr($img->mimeType(), -3);
-		if ($type === 'peg') {
-			$type = 'jpg';
-		}
-		if ($type !== 'jpg' && $type !== 'png') {
-			throw new \Exception($this->l->t('Unknown filetype'));
-		}
-
-		if (!$img->valid()) {
-			throw new \Exception($this->l->t('Invalid image'));
-		}
-
-		if (!($img->height() === $img->width())) {
-			throw new NotSquareException($this->l->t('Avatar image is not square'));
-		}
-
-		$this->remove();
-		$file = $this->folder->newFile('avatar.'.$type);
-		$file->putContent($data);
-
-		try {
-			$generated = $this->folder->getFile('generated');
-			$generated->delete();
-		} catch (NotFoundException $e) {
-			//
-		}
-		$this->user->triggerChange('avatar', $file);
-	}
-
-	/**
-	 * remove the users avatar
-	 * @return void
-	*/
-	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->user->triggerChange('avatar', '');
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getFile($size) {
-		try {
-			$ext = $this->getExtension();
-		} catch (NotFoundException $e) {
-			$data = $this->generateAvatar($this->user->getDisplayName(), 1024);
-			$avatar = $this->folder->newFile('avatar.png');
-			$avatar->putContent($data);
-			$ext = 'png';
-
-			$this->folder->newFile('generated');
-		}
-
-		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')) {
-				$data = $this->generateAvatar($this->user->getDisplayName(), $size);
-
-			} else {
-				$avatar = new OC_Image();
-				/** @var ISimpleFile $file */
-				$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();
-			}
-
-		}
-
-		return $file;
-	}
-
-	/**
-	 * 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;
-	}
-
-	/**
-	 * @param string $userDisplayName
-	 * @param int $size
-	 * @return string
-	 */
-	private function generateAvatar($userDisplayName, $size) {
-		$text = strtoupper(substr($userDisplayName, 0, 1));
-		$backgroundColor = $this->avatarBackgroundColor($userDisplayName);
-
-		$im = imagecreatetruecolor($size, $size);
-		$background = imagecolorallocate($im, $backgroundColor[0], $backgroundColor[1], $backgroundColor[2]);
-		$white = imagecolorallocate($im, 255, 255, 255);
-		imagefilledrectangle($im, 0, 0, $size, $size, $background);
-
-		$font = __DIR__ . '/../../core/fonts/OpenSans-Semibold.woff';
-
-		$fontSize = $size * 0.4;
-		$box = imagettfbbox($fontSize, 0, $font, $text);
-
-		$x = ($size - ($box[2] - $box[0])) / 2;
-		$y = ($size - ($box[1] - $box[7])) / 2;
-		$x += 1;
-		$y -= $box[7];
-		imagettftext($im, $fontSize, 0, $x, $y, $white, $font, $text);
-
-		ob_start();
-		imagepng($im);
-		$data = ob_get_contents();
-		ob_end_clean();
-
-		return $data;
-	}
-
-	/**
-	 * @param int $r
-	 * @param int $g
-	 * @param int $b
-	 * @return double[] Array containing h s l in [0, 1] range
-	 */
-	private function rgbToHsl($r, $g, $b) {
-		$r /= 255.0;
-		$g /= 255.0;
-		$b /= 255.0;
-
-		$max = max($r, $g, $b);
-		$min = min($r, $g, $b);
-
-
-		$h = ($max + $min) / 2.0;
-		$l = ($max + $min) / 2.0;
-
-		if($max === $min) {
-			$h = $s = 0; // Achromatic
-		} else {
-			$d = $max - $min;
-			$s = $l > 0.5 ? $d / (2 - $max - $min) : $d / ($max + $min);
-			switch($max) {
-				case $r:
-					$h = ($g - $b) / $d + ($g < $b ? 6 : 0);
-					break;
-				case $g:
-					$h = ($b - $r) / $d + 2.0;
-					break;
-				case $b:
-					$h = ($r - $g) / $d + 4.0;
-					break;
-			}
-			$h /= 6.0;
-		}
-		return [$h, $s, $l];
-
-	}
-
-	/**
-	 * @param string $text
-	 * @return int[] Array containting r g b in the range [0, 255]
-	 */
-	private function avatarBackgroundColor($text) {
-		$hash = preg_replace('/[^0-9a-f]+/', '', $text);
-
-		$hash = md5($hash);
-		$hashChars = str_split($hash);
-
-
-		// Init vars
-		$result = ['0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0'];
-		$rgb = [0, 0, 0];
-		$sat = 0.70;
-		$lum = 0.68;
-		$modulo = 16;
-
-
-		// Splitting evenly the string
-		foreach($hashChars as  $i => $char) {
-			$result[$i % $modulo] .= intval($char, 16);
-		}
-
-		// Converting our data into a usable rgb format
-		// Start at 1 because 16%3=1 but 15%3=0 and makes the repartition even
-		for($count = 1; $count < $modulo; $count++) {
-			$rgb[$count%3] += (int)$result[$count];
-		}
-
-		// Reduce values bigger than rgb requirements
-		$rgb[0] %= 255;
-		$rgb[1] %= 255;
-		$rgb[2] %= 255;
-
-		$hsl = $this->rgbToHsl($rgb[0], $rgb[1], $rgb[2]);
-
-		// Classic formula to check the brightness for our eye
-		// If too bright, lower the sat
-		$bright = sqrt(0.299 * ($rgb[0] ** 2) + 0.587 * ($rgb[1] ** 2) + 0.114 * ($rgb[2] ** 2));
-		if ($bright >= 200) {
-			$sat = 0.60;
-		}
-
-		return $this->hslToRgb($hsl[0], $sat, $lum);
-	}
-
-	/**
-	 * @param double $h Hue in range [0, 1]
-	 * @param double $s Saturation in range [0, 1]
-	 * @param double $l Lightness in range [0, 1]
-	 * @return int[] Array containing r g b in the range [0, 255]
-	 */
-	private function hslToRgb($h, $s, $l){
-		$hue2rgb = function ($p, $q, $t){
-			if($t < 0) {
-				$t += 1;
-			}
-			if($t > 1) {
-				$t -= 1;
-			}
-			if($t < 1/6) {
-				return $p + ($q - $p) * 6 * $t;
-			}
-			if($t < 1/2) {
-				return $q;
-			}
-			if($t < 2/3) {
-				return $p + ($q - $p) * (2/3 - $t) * 6;
-			}
-			return $p;
-		};
-
-		if($s === 0){
-			$r = $l;
-			$g = $l;
-			$b = $l; // achromatic
-		}else{
-			$q = $l < 0.5 ? $l * (1 + $s) : $l + $s - $l * $s;
-			$p = 2 * $l - $q;
-			$r = $hue2rgb($p, $q, $h + 1/3);
-			$g = $hue2rgb($p, $q, $h);
-			$b = $hue2rgb($p, $q, $h - 1/3);
-		}
-
-		return array(round($r * 255), round($g * 255), round($b * 255));
-	}
+    /** @var ISimpleFolder */
+    private $folder;
+    /** @var IL10N */
+    private $l;
+    /** @var User */
+    private $user;
+    /** @var ILogger  */
+    private $logger;
+    /** @var IConfig */
+    private $config;
+
+    /**
+     * constructor
+     *
+     * @param ISimpleFolder $folder The folder where the avatars are
+     * @param IL10N $l
+     * @param User $user
+     * @param ILogger $logger
+     * @param IConfig $config
+     */
+    public function __construct(ISimpleFolder $folder,
+                                IL10N $l,
+                                $user,
+                                ILogger $logger,
+                                IConfig $config) {
+        $this->folder = $folder;
+        $this->l = $l;
+        $this->user = $user;
+        $this->logger = $logger;
+        $this->config = $config;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function get ($size = 64) {
+        try {
+            $file = $this->getFile($size);
+        } catch (NotFoundException $e) {
+            return false;
+        }
+
+        $avatar = new OC_Image();
+        $avatar->loadFromData($file->getContent());
+        return $avatar;
+    }
+
+    /**
+     * 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) {
+
+        if($data instanceOf IImage) {
+            $img = $data;
+            $data = $img->data();
+        } else {
+            $img = new OC_Image($data);
+        }
+        $type = substr($img->mimeType(), -3);
+        if ($type === 'peg') {
+            $type = 'jpg';
+        }
+        if ($type !== 'jpg' && $type !== 'png') {
+            throw new \Exception($this->l->t('Unknown filetype'));
+        }
+
+        if (!$img->valid()) {
+            throw new \Exception($this->l->t('Invalid image'));
+        }
+
+        if (!($img->height() === $img->width())) {
+            throw new NotSquareException($this->l->t('Avatar image is not square'));
+        }
+
+        $this->remove();
+        $file = $this->folder->newFile('avatar.'.$type);
+        $file->putContent($data);
+
+        try {
+            $generated = $this->folder->getFile('generated');
+            $generated->delete();
+        } catch (NotFoundException $e) {
+            //
+        }
+        $this->user->triggerChange('avatar', $file);
+    }
+
+    /**
+     * remove the users avatar
+     * @return void
+     */
+    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->user->triggerChange('avatar', '');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFile($size) {
+        try {
+            $ext = $this->getExtension();
+        } catch (NotFoundException $e) {
+            $data = $this->generateAvatar($this->user->getDisplayName(), 1024);
+            $avatar = $this->folder->newFile('avatar.png');
+            $avatar->putContent($data);
+            $ext = 'png';
+
+            $this->folder->newFile('generated');
+        }
+
+        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')) {
+                $data = $this->generateAvatar($this->user->getDisplayName(), $size);
+
+            } else {
+                $avatar = new OC_Image();
+                /** @var ISimpleFile $file */
+                $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();
+            }
+
+        }
+
+        return $file;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * @param string $userDisplayName
+     * @param int $size
+     * @return string
+     */
+    private function generateAvatar($userDisplayName, $size) {
+        $text = strtoupper(substr($userDisplayName, 0, 1));
+        $backgroundColor = $this->avatarBackgroundColor($userDisplayName);
+
+        $im = imagecreatetruecolor($size, $size);
+        $background = imagecolorallocate($im, $backgroundColor[0], $backgroundColor[1], $backgroundColor[2]);
+        $white = imagecolorallocate($im, 255, 255, 255);
+        imagefilledrectangle($im, 0, 0, $size, $size, $background);
+
+        $font = __DIR__ . '/../../core/fonts/OpenSans-Semibold.woff';
+
+        $fontSize = $size * 0.4;
+        $box = imagettfbbox($fontSize, 0, $font, $text);
+
+        $x = ($size - ($box[2] - $box[0])) / 2;
+        $y = ($size - ($box[1] - $box[7])) / 2;
+        $x += 1;
+        $y -= $box[7];
+        imagettftext($im, $fontSize, 0, $x, $y, $white, $font, $text);
+
+        ob_start();
+        imagepng($im);
+        $data = ob_get_contents();
+        ob_end_clean();
+
+        return $data;
+    }
+
+    /**
+     * @param int $r
+     * @param int $g
+     * @param int $b
+     * @return double[] Array containing h s l in [0, 1] range
+     */
+    private function rgbToHsl($r, $g, $b) {
+        $r /= 255.0;
+        $g /= 255.0;
+        $b /= 255.0;
+
+        $max = max($r, $g, $b);
+        $min = min($r, $g, $b);
+
+
+        $h = ($max + $min) / 2.0;
+        $l = ($max + $min) / 2.0;
+
+        if($max === $min) {
+            $h = $s = 0; // Achromatic
+        } else {
+            $d = $max - $min;
+            $s = $l > 0.5 ? $d / (2 - $max - $min) : $d / ($max + $min);
+            switch($max) {
+                case $r:
+                    $h = ($g - $b) / $d + ($g < $b ? 6 : 0);
+                    break;
+                case $g:
+                    $h = ($b - $r) / $d + 2.0;
+                    break;
+                case $b:
+                    $h = ($r - $g) / $d + 4.0;
+                    break;
+            }
+            $h /= 6.0;
+        }
+        return [$h, $s, $l];
+
+    }
+
+    /**
+     * @param string $text
+     * @return int[] Array containting r g b in the range [0, 255]
+     */
+    private function avatarBackgroundColor($text) {
+        $hash = preg_replace('/[^0-9a-f]+/', '', $text);
+
+        $hash = md5($hash);
+        $hashChars = str_split($hash);
+
+
+        // Init vars
+        $result = ['0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0'];
+        $rgb = [0, 0, 0];
+        $sat = 0.70;
+        $lum = 0.68;
+        $modulo = 16;
+
+
+        // Splitting evenly the string
+        foreach($hashChars as  $i => $char) {
+            $result[$i % $modulo] .= intval($char, 16);
+        }
+
+        // Converting our data into a usable rgb format
+        // Start at 1 because 16%3=1 but 15%3=0 and makes the repartition even
+        for($count = 1; $count < $modulo; $count++) {
+            $rgb[$count%3] += (int)$result[$count];
+        }
+
+        // Reduce values bigger than rgb requirements
+        $rgb[0] %= 255;
+        $rgb[1] %= 255;
+        $rgb[2] %= 255;
+
+        $hsl = $this->rgbToHsl($rgb[0], $rgb[1], $rgb[2]);
+
+        // Classic formula to check the brightness for our eye
+        // If too bright, lower the sat
+        $bright = sqrt(0.299 * ($rgb[0] ** 2) + 0.587 * ($rgb[1] ** 2) + 0.114 * ($rgb[2] ** 2));
+        if ($bright >= 200) {
+            $sat = 0.60;
+        }
+
+        return $this->hslToRgb($hsl[0], $sat, $lum);
+    }
+
+    /**
+     * @param double $h Hue in range [0, 1]
+     * @param double $s Saturation in range [0, 1]
+     * @param double $l Lightness in range [0, 1]
+     * @return int[] Array containing r g b in the range [0, 255]
+     */
+    private function hslToRgb($h, $s, $l){
+        $hue2rgb = function ($p, $q, $t){
+            if($t < 0) {
+                $t += 1;
+            }
+            if($t > 1) {
+                $t -= 1;
+            }
+            if($t < 1/6) {
+                return $p + ($q - $p) * 6 * $t;
+            }
+            if($t < 1/2) {
+                return $q;
+            }
+            if($t < 2/3) {
+                return $p + ($q - $p) * (2/3 - $t) * 6;
+            }
+            return $p;
+        };
+
+        if($s === 0){
+            $r = $l;
+            $g = $l;
+            $b = $l; // achromatic
+        }else{
+            $q = $l < 0.5 ? $l * (1 + $s) : $l + $s - $l * $s;
+            $p = 2 * $l - $q;
+            $r = $hue2rgb($p, $q, $h + 1/3);
+            $g = $hue2rgb($p, $q, $h);
+            $b = $hue2rgb($p, $q, $h - 1/3);
+        }
+
+        return array(round($r * 255), round($g * 255), round($b * 255));
+    }
 
 }

Spacing +27 added lines, -27 removed lines

@@ -81,7 +81,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function get ($size = 64) {
+	public function get($size = 64) {
 		try {
 			$file = $this->getFile($size);
 		} catch (NotFoundException $e) {
@@ -111,9 +111,9 @@ 
 	 * @throws NotSquareException if the image is not square
 	 * @return void
 	*/
-	public function set ($data) {
+	public function set($data) {
 
-		if($data instanceOf IImage) {
+		if ($data instanceOf IImage) {
 			$img = $data;
 			$data = $img->data();
 		} else {
@@ -152,11 +152,11 @@ 
 	 * remove the users avatar
 	 * @return void
 	*/
-	public function remove () {
+	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);
+			(int) $this->config->getUserValue($this->user->getUID(), 'avatar', 'version', 0) + 1);
 
 		foreach ($avatars as $avatar) {
 			$avatar->delete();
@@ -180,9 +180,9 @@ 
 		}
 
 		if ($size === -1) {
-			$path = 'avatar.' . $ext;
+			$path = 'avatar.'.$ext;
 		} else {
-			$path = 'avatar.' . $size . '.' . $ext;
+			$path = 'avatar.'.$size.'.'.$ext;
 		}
 
 		try {
@@ -198,7 +198,7 @@ 
 			} else {
 				$avatar = new OC_Image();
 				/** @var ISimpleFile $file */
-				$file = $this->folder->getFile('avatar.' . $ext);
+				$file = $this->folder->getFile('avatar.'.$ext);
 				$avatar->loadFromData($file->getContent());
 				$avatar->resize($size);
 				$data = $avatar->data();
@@ -208,7 +208,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();
 			}
 
@@ -246,7 +246,7 @@ 
 		$white = imagecolorallocate($im, 255, 255, 255);
 		imagefilledrectangle($im, 0, 0, $size, $size, $background);
 
-		$font = __DIR__ . '/../../core/fonts/OpenSans-Semibold.woff';
+		$font = __DIR__.'/../../core/fonts/OpenSans-Semibold.woff';
 
 		$fontSize = $size * 0.4;
 		$box = imagettfbbox($fontSize, 0, $font, $text);
@@ -283,12 +283,12 @@ 
 		$h = ($max + $min) / 2.0;
 		$l = ($max + $min) / 2.0;
 
-		if($max === $min) {
+		if ($max === $min) {
 			$h = $s = 0; // Achromatic
 		} else {
 			$d = $max - $min;
 			$s = $l > 0.5 ? $d / (2 - $max - $min) : $d / ($max + $min);
-			switch($max) {
+			switch ($max) {
 				case $r:
 					$h = ($g - $b) / $d + ($g < $b ? 6 : 0);
 					break;
@@ -325,14 +325,14 @@ 
 
 
 		// Splitting evenly the string
-		foreach($hashChars as  $i => $char) {
+		foreach ($hashChars as  $i => $char) {
 			$result[$i % $modulo] .= intval($char, 16);
 		}
 
 		// Converting our data into a usable rgb format
 		// Start at 1 because 16%3=1 but 15%3=0 and makes the repartition even
-		for($count = 1; $count < $modulo; $count++) {
-			$rgb[$count%3] += (int)$result[$count];
+		for ($count = 1; $count < $modulo; $count++) {
+			$rgb[$count % 3] += (int) $result[$count];
 		}
 
 		// Reduce values bigger than rgb requirements
@@ -358,36 +358,36 @@ 
 	 * @param double $l Lightness in range [0, 1]
 	 * @return int[] Array containing r g b in the range [0, 255]
 	 */
-	private function hslToRgb($h, $s, $l){
-		$hue2rgb = function ($p, $q, $t){
-			if($t < 0) {
+	private function hslToRgb($h, $s, $l) {
+		$hue2rgb = function($p, $q, $t) {
+			if ($t < 0) {
 				$t += 1;
 			}
-			if($t > 1) {
+			if ($t > 1) {
 				$t -= 1;
 			}
-			if($t < 1/6) {
+			if ($t < 1 / 6) {
 				return $p + ($q - $p) * 6 * $t;
 			}
-			if($t < 1/2) {
+			if ($t < 1 / 2) {
 				return $q;
 			}
-			if($t < 2/3) {
-				return $p + ($q - $p) * (2/3 - $t) * 6;
+			if ($t < 2 / 3) {
+				return $p + ($q - $p) * (2 / 3 - $t) * 6;
 			}
 			return $p;
 		};
 
-		if($s === 0){
+		if ($s === 0) {
 			$r = $l;
 			$g = $l;
 			$b = $l; // achromatic
-		}else{
+		} else {
 			$q = $l < 0.5 ? $l * (1 + $s) : $l + $s - $l * $s;
 			$p = 2 * $l - $q;
-			$r = $hue2rgb($p, $q, $h + 1/3);
+			$r = $hue2rgb($p, $q, $h + 1 / 3);
 			$g = $hue2rgb($p, $q, $h);
-			$b = $hue2rgb($p, $q, $h - 1/3);
+			$b = $hue2rgb($p, $q, $h - 1 / 3);
 		}
 
 		return array(round($r * 255), round($g * 255), round($b * 255));

core/Controller/AvatarController.php

Indentation +287 added lines, -287 removed lines

@@ -50,292 +50,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;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IAvatarManager $avatarManager
-	 * @param ICache $cache
-	 * @param IL10N $l10n
-	 * @param IUserManager $userManager
-	 * @param IRootFolder $rootFolder
-	 * @param ILogger $logger
-	 * @param string $userId
-	 * @param TimeFactory $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 > 2048) {
-			$size = 2048;
-		} elseif ($size <= 0) {
-			$size = 64;
-		}
-
-		try {
-			$avatar = $this->avatarManager->getAvatar($userId)->getFile($size);
-			$resp = new FileDisplayResponse($avatar,
-				Http::STATUS_OK,
-				['Content-Type' => $avatar->getMimeType()]);
-		} catch (\Exception $e) {
-			$resp = new Http\Response();
-			$resp->setStatus(Http::STATUS_NOT_FOUND);
-			return $resp;
-		}
-
-		// Let cache this!
-		$resp->addHeader('Pragma', 'public');
-		// Cache for 30 minutes
-		$resp->cacheFor(1800);
-
-		$expires = new \DateTime();
-		$expires->setTimestamp($this->timeFactory->getTime());
-		$expires->add(new \DateInterval('PT30M'));
-		$resp->addHeader('Expires', $expires->format(\DateTime::RFC1123));
-
-		return $resp;
-	}
-
-	/**
-	 * @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 {
-				return new JSONResponse(
-					['data' => ['message' => $this->l->t('Invalid file provided')]],
-					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
+    /** @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;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IAvatarManager $avatarManager
+     * @param ICache $cache
+     * @param IL10N $l10n
+     * @param IUserManager $userManager
+     * @param IRootFolder $rootFolder
+     * @param ILogger $logger
+     * @param string $userId
+     * @param TimeFactory $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
      *
-	 * @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($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($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);
-		}
-	}
+     * @param string $userId
+     * @param int $size
+     * @return JSONResponse|FileDisplayResponse
+     */
+    public function getAvatar($userId, $size) {
+        if ($size > 2048) {
+            $size = 2048;
+        } elseif ($size <= 0) {
+            $size = 64;
+        }
+
+        try {
+            $avatar = $this->avatarManager->getAvatar($userId)->getFile($size);
+            $resp = new FileDisplayResponse($avatar,
+                Http::STATUS_OK,
+                ['Content-Type' => $avatar->getMimeType()]);
+        } catch (\Exception $e) {
+            $resp = new Http\Response();
+            $resp->setStatus(Http::STATUS_NOT_FOUND);
+            return $resp;
+        }
+
+        // Let cache this!
+        $resp->addHeader('Pragma', 'public');
+        // Cache for 30 minutes
+        $resp->cacheFor(1800);
+
+        $expires = new \DateTime();
+        $expires->setTimestamp($this->timeFactory->getTime());
+        $expires->add(new \DateInterval('PT30M'));
+        $resp->addHeader('Expires', $expires->format(\DateTime::RFC1123));
+
+        return $resp;
+    }
+
+    /**
+     * @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 {
+                return new JSONResponse(
+                    ['data' => ['message' => $this->l->t('Invalid file provided')]],
+                    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($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($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);
+        }
+    }
 }