nextcloud / server

apps/dav/lib/CardDAV/PhotoCache.php

Indentation +241 added lines, -241 removed lines

@@ -35,245 +35,245 @@
 
 class PhotoCache {
 
-	/** @var array  */
-	protected const ALLOWED_CONTENT_TYPES = [
-		'image/png' => 'png',
-		'image/jpeg' => 'jpg',
-		'image/gif' => 'gif',
-		'image/vnd.microsoft.icon' => 'ico',
-	];
-
-	/** @var IAppData */
-	protected $appData;
-
-	/** @var ILogger */
-	protected $logger;
-
-	/**
-	 * PhotoCache constructor.
-	 *
-	 * @param IAppData $appData
-	 * @param ILogger $logger
-	 */
-	public function __construct(IAppData $appData, ILogger $logger) {
-		$this->appData = $appData;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 * @param int $size
-	 * @param Card $card
-	 *
-	 * @return ISimpleFile
-	 * @throws NotFoundException
-	 */
-	public function get($addressBookId, $cardUri, $size, Card $card) {
-		$folder = $this->getFolder($addressBookId, $cardUri);
-
-		if ($this->isEmpty($folder)) {
-			$this->init($folder, $card);
-		}
-
-		if (!$this->hasPhoto($folder)) {
-			throw new NotFoundException();
-		}
-
-		if ($size !== -1) {
-			$size = 2 ** ceil(log($size) / log(2));
-		}
-
-		return $this->getFile($folder, $size);
-	}
-
-	/**
-	 * @param ISimpleFolder $folder
-	 * @return bool
-	 */
-	private function isEmpty(ISimpleFolder $folder) {
-		return $folder->getDirectoryListing() === [];
-	}
-
-	/**
-	 * @param ISimpleFolder $folder
-	 * @param Card $card
-	 * @throws NotPermittedException
-	 */
-	private function init(ISimpleFolder $folder, Card $card): void {
-		$data = $this->getPhoto($card);
-
-		if ($data === false || !isset($data['Content-Type'])) {
-			$folder->newFile('nophoto');
-			return;
-		}
-
-		$contentType = $data['Content-Type'];
-		$extension = self::ALLOWED_CONTENT_TYPES[$contentType] ?? null;
-
-		if ($extension === null) {
-			$folder->newFile('nophoto');
-			return;
-		}
-
-		$file = $folder->newFile('photo.' . $extension);
-		$file->putContent($data['body']);
-	}
-
-	private function hasPhoto(ISimpleFolder $folder) {
-		return !$folder->fileExists('nophoto');
-	}
-
-	private function getFile(ISimpleFolder $folder, $size) {
-		$ext = $this->getExtension($folder);
-
-		if ($size === -1) {
-			$path = 'photo.' . $ext;
-		} else {
-			$path = 'photo.' . $size . '.' . $ext;
-		}
-
-		try {
-			$file = $folder->getFile($path);
-		} catch (NotFoundException $e) {
-			if ($size <= 0) {
-				throw new NotFoundException;
-			}
-
-			$photo = new \OC_Image();
-			/** @var ISimpleFile $file */
-			$file = $folder->getFile('photo.' . $ext);
-			$photo->loadFromData($file->getContent());
-
-			$ratio = $photo->width() / $photo->height();
-			if ($ratio < 1) {
-				$ratio = 1 / $ratio;
-			}
-
-			$size = (int) ($size * $ratio);
-			if ($size !== -1) {
-				$photo->resize($size);
-			}
-
-			try {
-				$file = $folder->newFile($path);
-				$file->putContent($photo->data());
-			} catch (NotPermittedException $e) {
-
-			}
-		}
-
-		return $file;
-	}
-
-	/**
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 * @return ISimpleFolder
-	 */
-	private function getFolder($addressBookId, $cardUri) {
-		$hash = md5($addressBookId . ' ' . $cardUri);
-		try {
-			return $this->appData->getFolder($hash);
-		} catch (NotFoundException $e) {
-			return $this->appData->newFolder($hash);
-		}
-	}
-
-	/**
-	 * Get the extension of the avatar. If there is no avatar throw Exception
-	 *
-	 * @param ISimpleFolder $folder
-	 * @return string
-	 * @throws NotFoundException
-	 */
-	private function getExtension(ISimpleFolder $folder): string {
-		foreach (self::ALLOWED_CONTENT_TYPES as $extension) {
-			if ($folder->fileExists('photo.' . $extension)) {
-				return $extension;
-			}
-		}
-
-		throw new NotFoundException('Avatar not found');
-	}
-
-	private function getPhoto(Card $node) {
-		try {
-			$vObject = $this->readCard($node->get());
-			if (!$vObject->PHOTO) {
-				return false;
-			}
-
-			$photo = $vObject->PHOTO;
-			$val = $photo->getValue();
-
-			// handle data URI. e.g PHOTO;VALUE=URI:data:image/jpeg;base64,/9j/4AAQSkZJRgABAQE
-			if ($photo->getValueType() === 'URI') {
-				$parsed = \Sabre\URI\parse($val);
-
-				// only allow data://
-				if ($parsed['scheme'] !== 'data') {
-					return false;
-				}
-				if (substr_count($parsed['path'], ';') === 1) {
-					list($type) = explode(';', $parsed['path']);
-				}
-				$val = file_get_contents($val);
-			} else {
-				// get type if binary data
-				$type = $this->getBinaryType($photo);
-			}
-
-			if (empty($type) || !isset(self::ALLOWED_CONTENT_TYPES[$type])) {
-				$type = 'application/octet-stream';
-			}
-
-			return [
-				'Content-Type' => $type,
-				'body'         => $val
-			];
-		} catch (\Exception $e) {
-			$this->logger->logException($e, [
-				'message' => 'Exception during vcard photo parsing'
-			]);
-		}
-		return false;
-	}
-
-	/**
-	 * @param string $cardData
-	 * @return \Sabre\VObject\Document
-	 */
-	private function readCard($cardData) {
-		return Reader::read($cardData);
-	}
-
-	/**
-	 * @param Binary $photo
-	 * @return string
-	 */
-	private function getBinaryType(Binary $photo) {
-		$params = $photo->parameters();
-		if (isset($params['TYPE']) || isset($params['MEDIATYPE'])) {
-			/** @var Parameter $typeParam */
-			$typeParam = isset($params['TYPE']) ? $params['TYPE'] : $params['MEDIATYPE'];
-			$type = $typeParam->getValue();
-
-			if (strpos($type, 'image/') === 0) {
-				return $type;
-			} else {
-				return 'image/' . strtolower($type);
-			}
-		}
-		return '';
-	}
-
-	/**
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 */
-	public function delete($addressBookId, $cardUri) {
-		$folder = $this->getFolder($addressBookId, $cardUri);
-		$folder->delete();
-	}
+    /** @var array  */
+    protected const ALLOWED_CONTENT_TYPES = [
+        'image/png' => 'png',
+        'image/jpeg' => 'jpg',
+        'image/gif' => 'gif',
+        'image/vnd.microsoft.icon' => 'ico',
+    ];
+
+    /** @var IAppData */
+    protected $appData;
+
+    /** @var ILogger */
+    protected $logger;
+
+    /**
+     * PhotoCache constructor.
+     *
+     * @param IAppData $appData
+     * @param ILogger $logger
+     */
+    public function __construct(IAppData $appData, ILogger $logger) {
+        $this->appData = $appData;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @param int $addressBookId
+     * @param string $cardUri
+     * @param int $size
+     * @param Card $card
+     *
+     * @return ISimpleFile
+     * @throws NotFoundException
+     */
+    public function get($addressBookId, $cardUri, $size, Card $card) {
+        $folder = $this->getFolder($addressBookId, $cardUri);
+
+        if ($this->isEmpty($folder)) {
+            $this->init($folder, $card);
+        }
+
+        if (!$this->hasPhoto($folder)) {
+            throw new NotFoundException();
+        }
+
+        if ($size !== -1) {
+            $size = 2 ** ceil(log($size) / log(2));
+        }
+
+        return $this->getFile($folder, $size);
+    }
+
+    /**
+     * @param ISimpleFolder $folder
+     * @return bool
+     */
+    private function isEmpty(ISimpleFolder $folder) {
+        return $folder->getDirectoryListing() === [];
+    }
+
+    /**
+     * @param ISimpleFolder $folder
+     * @param Card $card
+     * @throws NotPermittedException
+     */
+    private function init(ISimpleFolder $folder, Card $card): void {
+        $data = $this->getPhoto($card);
+
+        if ($data === false || !isset($data['Content-Type'])) {
+            $folder->newFile('nophoto');
+            return;
+        }
+
+        $contentType = $data['Content-Type'];
+        $extension = self::ALLOWED_CONTENT_TYPES[$contentType] ?? null;
+
+        if ($extension === null) {
+            $folder->newFile('nophoto');
+            return;
+        }
+
+        $file = $folder->newFile('photo.' . $extension);
+        $file->putContent($data['body']);
+    }
+
+    private function hasPhoto(ISimpleFolder $folder) {
+        return !$folder->fileExists('nophoto');
+    }
+
+    private function getFile(ISimpleFolder $folder, $size) {
+        $ext = $this->getExtension($folder);
+
+        if ($size === -1) {
+            $path = 'photo.' . $ext;
+        } else {
+            $path = 'photo.' . $size . '.' . $ext;
+        }
+
+        try {
+            $file = $folder->getFile($path);
+        } catch (NotFoundException $e) {
+            if ($size <= 0) {
+                throw new NotFoundException;
+            }
+
+            $photo = new \OC_Image();
+            /** @var ISimpleFile $file */
+            $file = $folder->getFile('photo.' . $ext);
+            $photo->loadFromData($file->getContent());
+
+            $ratio = $photo->width() / $photo->height();
+            if ($ratio < 1) {
+                $ratio = 1 / $ratio;
+            }
+
+            $size = (int) ($size * $ratio);
+            if ($size !== -1) {
+                $photo->resize($size);
+            }
+
+            try {
+                $file = $folder->newFile($path);
+                $file->putContent($photo->data());
+            } catch (NotPermittedException $e) {
+
+            }
+        }
+
+        return $file;
+    }
+
+    /**
+     * @param int $addressBookId
+     * @param string $cardUri
+     * @return ISimpleFolder
+     */
+    private function getFolder($addressBookId, $cardUri) {
+        $hash = md5($addressBookId . ' ' . $cardUri);
+        try {
+            return $this->appData->getFolder($hash);
+        } catch (NotFoundException $e) {
+            return $this->appData->newFolder($hash);
+        }
+    }
+
+    /**
+     * Get the extension of the avatar. If there is no avatar throw Exception
+     *
+     * @param ISimpleFolder $folder
+     * @return string
+     * @throws NotFoundException
+     */
+    private function getExtension(ISimpleFolder $folder): string {
+        foreach (self::ALLOWED_CONTENT_TYPES as $extension) {
+            if ($folder->fileExists('photo.' . $extension)) {
+                return $extension;
+            }
+        }
+
+        throw new NotFoundException('Avatar not found');
+    }
+
+    private function getPhoto(Card $node) {
+        try {
+            $vObject = $this->readCard($node->get());
+            if (!$vObject->PHOTO) {
+                return false;
+            }
+
+            $photo = $vObject->PHOTO;
+            $val = $photo->getValue();
+
+            // handle data URI. e.g PHOTO;VALUE=URI:data:image/jpeg;base64,/9j/4AAQSkZJRgABAQE
+            if ($photo->getValueType() === 'URI') {
+                $parsed = \Sabre\URI\parse($val);
+
+                // only allow data://
+                if ($parsed['scheme'] !== 'data') {
+                    return false;
+                }
+                if (substr_count($parsed['path'], ';') === 1) {
+                    list($type) = explode(';', $parsed['path']);
+                }
+                $val = file_get_contents($val);
+            } else {
+                // get type if binary data
+                $type = $this->getBinaryType($photo);
+            }
+
+            if (empty($type) || !isset(self::ALLOWED_CONTENT_TYPES[$type])) {
+                $type = 'application/octet-stream';
+            }
+
+            return [
+                'Content-Type' => $type,
+                'body'         => $val
+            ];
+        } catch (\Exception $e) {
+            $this->logger->logException($e, [
+                'message' => 'Exception during vcard photo parsing'
+            ]);
+        }
+        return false;
+    }
+
+    /**
+     * @param string $cardData
+     * @return \Sabre\VObject\Document
+     */
+    private function readCard($cardData) {
+        return Reader::read($cardData);
+    }
+
+    /**
+     * @param Binary $photo
+     * @return string
+     */
+    private function getBinaryType(Binary $photo) {
+        $params = $photo->parameters();
+        if (isset($params['TYPE']) || isset($params['MEDIATYPE'])) {
+            /** @var Parameter $typeParam */
+            $typeParam = isset($params['TYPE']) ? $params['TYPE'] : $params['MEDIATYPE'];
+            $type = $typeParam->getValue();
+
+            if (strpos($type, 'image/') === 0) {
+                return $type;
+            } else {
+                return 'image/' . strtolower($type);
+            }
+        }
+        return '';
+    }
+
+    /**
+     * @param int $addressBookId
+     * @param string $cardUri
+     */
+    public function delete($addressBookId, $cardUri) {
+        $folder = $this->getFolder($addressBookId, $cardUri);
+        $folder->delete();
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -116,7 +116,7 @@ 
 			return;
 		}
 
-		$file = $folder->newFile('photo.' . $extension);
+		$file = $folder->newFile('photo.'.$extension);
 		$file->putContent($data['body']);
 	}
 
@@ -128,9 +128,9 @@ 
 		$ext = $this->getExtension($folder);
 
 		if ($size === -1) {
-			$path = 'photo.' . $ext;
+			$path = 'photo.'.$ext;
 		} else {
-			$path = 'photo.' . $size . '.' . $ext;
+			$path = 'photo.'.$size.'.'.$ext;
 		}
 
 		try {
@@ -142,7 +142,7 @@ 
 
 			$photo = new \OC_Image();
 			/** @var ISimpleFile $file */
-			$file = $folder->getFile('photo.' . $ext);
+			$file = $folder->getFile('photo.'.$ext);
 			$photo->loadFromData($file->getContent());
 
 			$ratio = $photo->width() / $photo->height();
@@ -172,7 +172,7 @@ 
 	 * @return ISimpleFolder
 	 */
 	private function getFolder($addressBookId, $cardUri) {
-		$hash = md5($addressBookId . ' ' . $cardUri);
+		$hash = md5($addressBookId.' '.$cardUri);
 		try {
 			return $this->appData->getFolder($hash);
 		} catch (NotFoundException $e) {
@@ -189,7 +189,7 @@ 
 	 */
 	private function getExtension(ISimpleFolder $folder): string {
 		foreach (self::ALLOWED_CONTENT_TYPES as $extension) {
-			if ($folder->fileExists('photo.' . $extension)) {
+			if ($folder->fileExists('photo.'.$extension)) {
 				return $extension;
 			}
 		}
@@ -262,7 +262,7 @@ 
 			if (strpos($type, 'image/') === 0) {
 				return $type;
 			} else {
-				return 'image/' . strtolower($type);
+				return 'image/'.strtolower($type);
 			}
 		}
 		return '';