nextcloud / server

lib/private/Avatar.php

Doc Comments +10 added lines, -2 removed lines

@@ -44,6 +44,12 @@ 
 
 class Color {
 	public $r, $g, $b;
+
+	/**
+	 * @param integer $r
+	 * @param integer $g
+	 * @param integer $b
+	 */
 	public function __construct($r, $g, $b) {
 		$this->r = $r;
 		$this->g = $g;
@@ -304,6 +310,7 @@ 
 	 * Calculate steps between two Colors
 	 * @param object Color $steps start color
 	 * @param object Color $ends end color
+	 * @param integer $steps
 	 * @return array [r,g,b] steps for each color to go from $steps to $ends
 	 */
 	private function stepCalc($steps, $ends) {
@@ -315,8 +322,9 @@ 
 	}
 	/**
 	 * Convert a string to an integer evenly
-	 * @param string $hash the text to parse
-	 * @param int $maximum the maximum range
+	 * @param integer $steps
+	 * @param Color $color1
+	 * @param Color $color2
 	 * @return int between 0 and $maximum
 	 */
 	private function mixPalette($steps, $color1, $color2) {

Spacing +14 added lines, -14 removed lines

@@ -91,7 +91,7 @@ 
 	/**
 	 * @inheritdoc
 	 */
-	public function get ($size = 64) {
+	public function get($size = 64) {
 		try {
 			$file = $this->getFile($size);
 		} catch (NotFoundException $e) {
@@ -121,16 +121,16 @@ 
 	 * @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 {
 			$img = new OC_Image();
 			if (is_resource($data) && get_resource_type($data) === "gd") {
 				$img->setResource($data);
-			} elseif(is_resource($data)) {
+			} elseif (is_resource($data)) {
 				$img->loadFromFileHandle($data);
 			} else {
 				try {
@@ -180,11 +180,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();
@@ -210,9 +210,9 @@ 
 		}
 
 		if ($size === -1) {
-			$path = 'avatar.' . $ext;
+			$path = 'avatar.'.$ext;
 		} else {
-			$path = 'avatar.' . $size . '.' . $ext;
+			$path = 'avatar.'.$size.'.'.$ext;
 		}
 
 		try {
@@ -228,7 +228,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();
@@ -238,13 +238,13 @@ 
 				$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();
 			}
 
 		}
 
-		if($this->config->getUserValue($this->user->getUID(), 'avatar', 'generated', null) === null) {
+		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);
 		}
@@ -281,7 +281,7 @@ 
 		$white = imagecolorallocate($im, 255, 255, 255);
 		imagefilledrectangle($im, 0, 0, $size, $size, $background);
 
-		$font = __DIR__ . '/../../core/fonts/OpenSans-Semibold.ttf';
+		$font = __DIR__.'/../../core/fonts/OpenSans-Semibold.ttf';
 
 		$fontSize = $size * 0.4;
 		$box = imagettfbbox($fontSize, 0, $font, $text);
@@ -344,7 +344,7 @@ 
 		$result = array();
 
 		// Splitting evenly the string
-		for ($i=0; $i< strlen($hash); $i++) {
+		for ($i = 0; $i < strlen($hash); $i++) {
 			// chars in md5 goes up to f, hex:16
 			$result[] = intval(substr($hash, $i, 1), 16) % 16;
 		}
@@ -380,7 +380,7 @@ 
 
 		$finalPalette = array_merge($palette1, $palette2, $palette3);
 
-		return $finalPalette[$this->hashToInt($hash, $steps * 3 )];
+		return $finalPalette[$this->hashToInt($hash, $steps * 3)];
 	}
 
 	public function userChanged($feature, $oldValue, $newValue) {