nextcloud / server

lib/private/legacy/image.php

Doc Comments +1 added lines, -1 removed lines

@@ -299,7 +299,7 @@
 	}
 
 	/**
-	 * @param resource Returns the image resource in any.
+	 * @param resource resource the image resource in any.
 	 * @throws \InvalidArgumentException in case the supplied resource does not have the type "gd"
 	 */
 	public function setResource($resource) {

Spacing +44 added lines, -44 removed lines

@@ -133,7 +133,7 @@ 
 	 */
 	public function widthTopLeft() {
 		$o = $this->getOrientation();
-		$this->logger->debug('OC_Image->widthTopLeft() Orientation: ' . $o, array('app' => 'core'));
+		$this->logger->debug('OC_Image->widthTopLeft() Orientation: '.$o, array('app' => 'core'));
 		switch ($o) {
 			case -1:
 			case 1:
@@ -157,7 +157,7 @@ 
 	 */
 	public function heightTopLeft() {
 		$o = $this->getOrientation();
-		$this->logger->debug('OC_Image->heightTopLeft() Orientation: ' . $o, array('app' => 'core'));
+		$this->logger->debug('OC_Image->heightTopLeft() Orientation: '.$o, array('app' => 'core'));
 		switch ($o) {
 			case -1:
 			case 1:
@@ -184,7 +184,7 @@ 
 		if ($mimeType === null) {
 			$mimeType = $this->mimeType();
 		}
-		header('Content-Type: ' . $mimeType);
+		header('Content-Type: '.$mimeType);
 		return $this->_output(null, $mimeType);
 	}
 
@@ -202,7 +202,7 @@ 
 		}
 		if ($filePath === null) {
 			if ($this->filePath === null) {
-				$this->logger->error(__METHOD__ . '(): called with no path.', array('app' => 'core'));
+				$this->logger->error(__METHOD__.'(): called with no path.', array('app' => 'core'));
 				return false;
 			} else {
 				$filePath = $this->filePath;
@@ -226,10 +226,10 @@ 
 			}
 			$isWritable = is_writable(dirname($filePath));
 			if (!$isWritable) {
-				$this->logger->error(__METHOD__ . '(): Directory \'' . dirname($filePath) . '\' is not writable.', array('app' => 'core'));
+				$this->logger->error(__METHOD__.'(): Directory \''.dirname($filePath).'\' is not writable.', array('app' => 'core'));
 				return false;
 			} elseif ($isWritable && file_exists($filePath) && !is_writable($filePath)) {
-				$this->logger->error(__METHOD__ . '(): File \'' . $filePath . '\' is not writable.', array('app' => 'core'));
+				$this->logger->error(__METHOD__.'(): File \''.$filePath.'\' is not writable.', array('app' => 'core'));
 				return false;
 			}
 		}
@@ -257,7 +257,7 @@ 
 					$imageType = IMAGETYPE_BMP;
 					break;
 				default:
-					throw new Exception('\OC_Image::_output(): "' . $mimeType . '" is not supported when forcing a specific output format');
+					throw new Exception('\OC_Image::_output(): "'.$mimeType.'" is not supported when forcing a specific output format');
 			}
 		}
 
@@ -436,7 +436,7 @@ 
 			return;
 		}
 
-		$exif = @exif_read_data('data://image/jpeg;base64,' . base64_encode($data));
+		$exif = @exif_read_data('data://image/jpeg;base64,'.base64_encode($data));
 		if (!$exif) {
 			return;
 		}
@@ -454,7 +454,7 @@ 
 	 */
 	public function fixOrientation() {
 		$o = $this->getOrientation();
-		$this->logger->debug('OC_Image->fixOrientation() Orientation: ' . $o, array('app' => 'core'));
+		$this->logger->debug('OC_Image->fixOrientation() Orientation: '.$o, array('app' => 'core'));
 		$rotate = 0;
 		$flip = false;
 		switch ($o) {
@@ -489,7 +489,7 @@ 
 				$rotate = 90;
 				break;
 		}
-		if($flip && function_exists('imageflip')) {
+		if ($flip && function_exists('imageflip')) {
 			imageflip($this->resource, IMG_FLIP_HORIZONTAL);
 		}
 		if ($rotate) {
@@ -551,7 +551,7 @@ 
 					imagealphablending($this->resource, true);
 					imagesavealpha($this->resource, true);
 				} else {
-					$this->logger->debug('OC_Image->loadFromFile, GIF images not supported: ' . $imagePath, array('app' => 'core'));
+					$this->logger->debug('OC_Image->loadFromFile, GIF images not supported: '.$imagePath, array('app' => 'core'));
 				}
 				break;
 			case IMAGETYPE_JPEG:
@@ -559,10 +559,10 @@ 
 					if (getimagesize($imagePath) !== false) {
 						$this->resource = @imagecreatefromjpeg($imagePath);
 					} else {
-						$this->logger->debug('OC_Image->loadFromFile, JPG image not valid: ' . $imagePath, array('app' => 'core'));
+						$this->logger->debug('OC_Image->loadFromFile, JPG image not valid: '.$imagePath, array('app' => 'core'));
 					}
 				} else {
-					$this->logger->debug('OC_Image->loadFromFile, JPG images not supported: ' . $imagePath, array('app' => 'core'));
+					$this->logger->debug('OC_Image->loadFromFile, JPG images not supported: '.$imagePath, array('app' => 'core'));
 				}
 				break;
 			case IMAGETYPE_PNG:
@@ -572,21 +572,21 @@ 
 					imagealphablending($this->resource, true);
 					imagesavealpha($this->resource, true);
 				} else {
-					$this->logger->debug('OC_Image->loadFromFile, PNG images not supported: ' . $imagePath, array('app' => 'core'));
+					$this->logger->debug('OC_Image->loadFromFile, PNG images not supported: '.$imagePath, array('app' => 'core'));
 				}
 				break;
 			case IMAGETYPE_XBM:
 				if (imagetypes() & IMG_XPM) {
 					$this->resource = @imagecreatefromxbm($imagePath);
 				} else {
-					$this->logger->debug('OC_Image->loadFromFile, XBM/XPM images not supported: ' . $imagePath, array('app' => 'core'));
+					$this->logger->debug('OC_Image->loadFromFile, XBM/XPM images not supported: '.$imagePath, array('app' => 'core'));
 				}
 				break;
 			case IMAGETYPE_WBMP:
 				if (imagetypes() & IMG_WBMP) {
 					$this->resource = @imagecreatefromwbmp($imagePath);
 				} else {
-					$this->logger->debug('OC_Image->loadFromFile, WBMP images not supported: ' . $imagePath, array('app' => 'core'));
+					$this->logger->debug('OC_Image->loadFromFile, WBMP images not supported: '.$imagePath, array('app' => 'core'));
 				}
 				break;
 			case IMAGETYPE_BMP:
@@ -696,7 +696,7 @@ 
 	 */
 	private function imagecreatefrombmp($fileName) {
 		if (!($fh = fopen($fileName, 'rb'))) {
-			$this->logger->warning('imagecreatefrombmp: Can not open ' . $fileName, array('app' => 'core'));
+			$this->logger->warning('imagecreatefrombmp: Can not open '.$fileName, array('app' => 'core'));
 			return false;
 		}
 		// read file header
@@ -704,7 +704,7 @@ 
 		// check for bitmap
 		if ($meta['type'] != 19778) {
 			fclose($fh);
-			$this->logger->warning('imagecreatefrombmp: Can not open ' . $fileName . ' is not a bitmap!', array('app' => 'core'));
+			$this->logger->warning('imagecreatefrombmp: Can not open '.$fileName.' is not a bitmap!', array('app' => 'core'));
 			return false;
 		}
 		// read image header
@@ -728,7 +728,7 @@ 
 				$meta['imagesize'] = @filesize($fileName) - $meta['offset'];
 				if ($meta['imagesize'] < 1) {
 					fclose($fh);
-					$this->logger->warning('imagecreatefrombmp: Can not obtain file size of ' . $fileName . ' is not a bitmap!', array('app' => 'core'));
+					$this->logger->warning('imagecreatefrombmp: Can not obtain file size of '.$fileName.' is not a bitmap!', array('app' => 'core'));
 					return false;
 				}
 			}
@@ -738,7 +738,7 @@ 
 		// read color palette
 		$palette = array();
 		if ($meta['bits'] < 16) {
-			$palette = unpack('l' . $meta['colors'], fread($fh, $meta['colors'] * 4));
+			$palette = unpack('l'.$meta['colors'], fread($fh, $meta['colors'] * 4));
 			// in rare cases the color value is signed
 			if ($palette[1] < 0) {
 				foreach ($palette as $i => $color) {
@@ -751,7 +751,7 @@ 
 		if ($im == false) {
 			fclose($fh);
 			$this->logger->warning(
-				'imagecreatefrombmp: imagecreatetruecolor failed for file "' . $fileName . '" with dimensions ' . $meta['width'] . 'x' . $meta['height'],
+				'imagecreatefrombmp: imagecreatetruecolor failed for file "'.$fileName.'" with dimensions '.$meta['width'].'x'.$meta['height'],
 				array('app' => 'core'));
 			return false;
 		}
@@ -760,7 +760,7 @@ 
 		$p = 0;
 		$vide = chr(0);
 		$y = $meta['height'] - 1;
-		$error = 'imagecreatefrombmp: ' . $fileName . ' has not enough data!';
+		$error = 'imagecreatefrombmp: '.$fileName.' has not enough data!';
 		// loop through the image data beginning with the lower left corner
 		while ($y >= 0) {
 			$x = 0;
@@ -772,7 +772,7 @@ 
 							$this->logger->warning($error, array('app' => 'core'));
 							return $im;
 						}
-						$color = @unpack('V', $part . $vide);
+						$color = @unpack('V', $part.$vide);
 						break;
 					case 16:
 						if (!($part = substr($data, $p, 2))) {
@@ -784,16 +784,16 @@ 
 						$color[1] = (($color[1] & 0xf800) >> 8) * 65536 + (($color[1] & 0x07e0) >> 3) * 256 + (($color[1] & 0x001f) << 3);
 						break;
 					case 8:
-						$color = @unpack('n', $vide . substr($data, $p, 1));
+						$color = @unpack('n', $vide.substr($data, $p, 1));
 						$color[1] = (isset($palette[$color[1] + 1])) ? $palette[$color[1] + 1] : $palette[1];
 						break;
 					case 4:
-						$color = @unpack('n', $vide . substr($data, floor($p), 1));
+						$color = @unpack('n', $vide.substr($data, floor($p), 1));
 						$color[1] = ($p * 2) % 2 == 0 ? $color[1] >> 4 : $color[1] & 0x0F;
 						$color[1] = (isset($palette[$color[1] + 1])) ? $palette[$color[1] + 1] : $palette[1];
 						break;
 					case 1:
-						$color = @unpack('n', $vide . substr($data, floor($p), 1));
+						$color = @unpack('n', $vide.substr($data, floor($p), 1));
 						switch (($p * 8) % 8) {
 							case 0:
 								$color[1] = $color[1] >> 7;
@@ -824,7 +824,7 @@ 
 						break;
 					default:
 						fclose($fh);
-						$this->logger->warning('imagecreatefrombmp: ' . $fileName . ' has ' . $meta['bits'] . ' bits and this is not supported!', array('app' => 'core'));
+						$this->logger->warning('imagecreatefrombmp: '.$fileName.' has '.$meta['bits'].' bits and this is not supported!', array('app' => 'core'));
 						return false;
 				}
 				imagesetpixel($im, $x, $y, $color[1]);
@@ -846,7 +846,7 @@ 
 	 */
 	public function resize($maxSize) {
 		if (!$this->valid()) {
-			$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
+			$this->logger->error(__METHOD__.'(): No image loaded', array('app' => 'core'));
 			return false;
 		}
 		$widthOrig = imagesx($this->resource);
@@ -861,7 +861,7 @@ 
 			$newHeight = $maxSize;
 		}
 
-		$this->preciseResize((int)round($newWidth), (int)round($newHeight));
+		$this->preciseResize((int) round($newWidth), (int) round($newHeight));
 		return true;
 	}
 
@@ -872,7 +872,7 @@ 
 	 */
 	public function preciseResize(int $width, int $height): bool {
 		if (!$this->valid()) {
-			$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
+			$this->logger->error(__METHOD__.'(): No image loaded', array('app' => 'core'));
 			return false;
 		}
 		$widthOrig = imagesx($this->resource);
@@ -880,7 +880,7 @@ 
 		$process = imagecreatetruecolor($width, $height);
 
 		if ($process == false) {
-			$this->logger->error(__METHOD__ . '(): Error creating true color image', array('app' => 'core'));
+			$this->logger->error(__METHOD__.'(): Error creating true color image', array('app' => 'core'));
 			imagedestroy($process);
 			return false;
 		}
@@ -894,7 +894,7 @@ 
 
 		imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $width, $height, $widthOrig, $heightOrig);
 		if ($process == false) {
-			$this->logger->error(__METHOD__ . '(): Error re-sampling process image', array('app' => 'core'));
+			$this->logger->error(__METHOD__.'(): Error re-sampling process image', array('app' => 'core'));
 			imagedestroy($process);
 			return false;
 		}
@@ -952,7 +952,7 @@ 
 
 		imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $targetWidth, $targetHeight, $width, $height);
 		if ($process == false) {
-			$this->logger->error('OC_Image->centerCrop, Error re-sampling process image ' . $width . 'x' . $height, array('app' => 'core'));
+			$this->logger->error('OC_Image->centerCrop, Error re-sampling process image '.$width.'x'.$height, array('app' => 'core'));
 			imagedestroy($process);
 			return false;
 		}
@@ -972,12 +972,12 @@ 
 	 */
 	public function crop(int $x, int $y, int $w, int $h): bool {
 		if (!$this->valid()) {
-			$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
+			$this->logger->error(__METHOD__.'(): No image loaded', array('app' => 'core'));
 			return false;
 		}
 		$process = imagecreatetruecolor($w, $h);
 		if ($process == false) {
-			$this->logger->error(__METHOD__ . '(): Error creating true color image', array('app' => 'core'));
+			$this->logger->error(__METHOD__.'(): Error creating true color image', array('app' => 'core'));
 			imagedestroy($process);
 			return false;
 		}
@@ -991,7 +991,7 @@ 
 
 		imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $w, $h, $w, $h);
 		if ($process == false) {
-			$this->logger->error(__METHOD__ . '(): Error re-sampling process image ' . $w . 'x' . $h, array('app' => 'core'));
+			$this->logger->error(__METHOD__.'(): Error re-sampling process image '.$w.'x'.$h, array('app' => 'core'));
 			imagedestroy($process);
 			return false;
 		}
@@ -1011,7 +1011,7 @@ 
 	 */
 	public function fitIn($maxWidth, $maxHeight) {
 		if (!$this->valid()) {
-			$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
+			$this->logger->error(__METHOD__.'(): No image loaded', array('app' => 'core'));
 			return false;
 		}
 		$widthOrig = imagesx($this->resource);
@@ -1021,7 +1021,7 @@ 
 		$newWidth = min($maxWidth, $ratio * $maxHeight);
 		$newHeight = min($maxHeight, $maxWidth / $ratio);
 
-		$this->preciseResize((int)round($newWidth), (int)round($newHeight));
+		$this->preciseResize((int) round($newWidth), (int) round($newHeight));
 		return true;
 	}
 
@@ -1034,7 +1034,7 @@ 
 	 */
 	public function scaleDownToFit($maxWidth, $maxHeight) {
 		if (!$this->valid()) {
-			$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
+			$this->logger->error(__METHOD__.'(): No image loaded', array('app' => 'core'));
 			return false;
 		}
 		$widthOrig = imagesx($this->resource);
@@ -1092,7 +1092,7 @@ 
 		if ($bit <= 8) {
 			for ($i = 0; $i < $colorsNum; $i++) {
 				$colors = imagecolorsforindex($im, $i);
-				$rgbQuad .= chr($colors['blue']) . chr($colors['green']) . chr($colors['red']) . "\0";
+				$rgbQuad .= chr($colors['blue']).chr($colors['green']).chr($colors['red'])."\0";
 			}
 			$bmpData = '';
 			if ($compression == 0 || $bit < 8) {
@@ -1125,7 +1125,7 @@ 
 						$index = imagecolorat($im, $i, $j);
 						if ($index !== $lastIndex || $sameNum > 255) {
 							if ($sameNum != 0) {
-								$bmpData .= chr($sameNum) . chr($lastIndex);
+								$bmpData .= chr($sameNum).chr($lastIndex);
 							}
 							$lastIndex = $index;
 							$sameNum = 1;
@@ -1166,15 +1166,15 @@ 
 			$sizeData = strlen($bmpData);
 			$colorsNum = 0;
 		}
-		$fileHeader = 'BM' . pack('V3', 54 + $sizeQuad + $sizeData, 0, 54 + $sizeQuad);
+		$fileHeader = 'BM'.pack('V3', 54 + $sizeQuad + $sizeData, 0, 54 + $sizeQuad);
 		$infoHeader = pack('V3v2V*', 0x28, $width, $height, 1, $bit, $compression, $sizeData, 0, 0, $colorsNum, 0);
 		if ($fileName != '') {
 			$fp = fopen($fileName, 'wb');
-			fwrite($fp, $fileHeader . $infoHeader . $rgbQuad . $bmpData);
+			fwrite($fp, $fileHeader.$infoHeader.$rgbQuad.$bmpData);
 			fclose($fp);
 			return true;
 		}
-		echo $fileHeader . $infoHeader . $rgbQuad . $bmpData;
+		echo $fileHeader.$infoHeader.$rgbQuad.$bmpData;
 		return true;
 	}
 }

Indentation +1062 added lines, -1062 removed lines

@@ -43,556 +43,556 @@ 
  * Class for basic image manipulation
  */
 class OC_Image implements \OCP\IImage {
-	/** @var false|resource */
-	protected $resource = false; // tmp resource.
-	/** @var int */
-	protected $imageType = IMAGETYPE_PNG; // Default to png if file type isn't evident.
-	/** @var string */
-	protected $mimeType = 'image/png'; // Default to png
-	/** @var int */
-	protected $bitDepth = 24;
-	/** @var null|string */
-	protected $filePath = null;
-	/** @var finfo */
-	private $fileInfo;
-	/** @var \OCP\ILogger */
-	private $logger;
-	/** @var \OCP\IConfig */
-	private $config;
-	/** @var array */
-	private $exif;
+    /** @var false|resource */
+    protected $resource = false; // tmp resource.
+    /** @var int */
+    protected $imageType = IMAGETYPE_PNG; // Default to png if file type isn't evident.
+    /** @var string */
+    protected $mimeType = 'image/png'; // Default to png
+    /** @var int */
+    protected $bitDepth = 24;
+    /** @var null|string */
+    protected $filePath = null;
+    /** @var finfo */
+    private $fileInfo;
+    /** @var \OCP\ILogger */
+    private $logger;
+    /** @var \OCP\IConfig */
+    private $config;
+    /** @var array */
+    private $exif;
 
-	/**
-	 * Constructor.
-	 *
-	 * @param resource|string $imageRef The path to a local file, a base64 encoded string or a resource created by
-	 * an imagecreate* function.
-	 * @param \OCP\ILogger $logger
-	 * @param \OCP\IConfig $config
-	 * @throws \InvalidArgumentException in case the $imageRef parameter is not null
-	 */
-	public function __construct($imageRef = null, \OCP\ILogger $logger = null, \OCP\IConfig $config = null) {
-		$this->logger = $logger;
-		if ($logger === null) {
-			$this->logger = \OC::$server->getLogger();
-		}
-		$this->config = $config;
-		if ($config === null) {
-			$this->config = \OC::$server->getConfig();
-		}
+    /**
+     * Constructor.
+     *
+     * @param resource|string $imageRef The path to a local file, a base64 encoded string or a resource created by
+     * an imagecreate* function.
+     * @param \OCP\ILogger $logger
+     * @param \OCP\IConfig $config
+     * @throws \InvalidArgumentException in case the $imageRef parameter is not null
+     */
+    public function __construct($imageRef = null, \OCP\ILogger $logger = null, \OCP\IConfig $config = null) {
+        $this->logger = $logger;
+        if ($logger === null) {
+            $this->logger = \OC::$server->getLogger();
+        }
+        $this->config = $config;
+        if ($config === null) {
+            $this->config = \OC::$server->getConfig();
+        }
 
-		if (\OC_Util::fileInfoLoaded()) {
-			$this->fileInfo = new finfo(FILEINFO_MIME_TYPE);
-		}
+        if (\OC_Util::fileInfoLoaded()) {
+            $this->fileInfo = new finfo(FILEINFO_MIME_TYPE);
+        }
 
-		if ($imageRef !== null) {
-			throw new \InvalidArgumentException('The first parameter in the constructor is not supported anymore. Please use any of the load* methods of the image object to load an image.');
-		}
-	}
+        if ($imageRef !== null) {
+            throw new \InvalidArgumentException('The first parameter in the constructor is not supported anymore. Please use any of the load* methods of the image object to load an image.');
+        }
+    }
 
-	/**
-	 * Determine whether the object contains an image resource.
-	 *
-	 * @return bool
-	 */
-	public function valid() { // apparently you can't name a method 'empty'...
-		return is_resource($this->resource);
-	}
+    /**
+     * Determine whether the object contains an image resource.
+     *
+     * @return bool
+     */
+    public function valid() { // apparently you can't name a method 'empty'...
+        return is_resource($this->resource);
+    }
 
-	/**
-	 * Returns the MIME type of the image or an empty string if no image is loaded.
-	 *
-	 * @return string
-	 */
-	public function mimeType() {
-		return $this->valid() ? $this->mimeType : '';
-	}
+    /**
+     * Returns the MIME type of the image or an empty string if no image is loaded.
+     *
+     * @return string
+     */
+    public function mimeType() {
+        return $this->valid() ? $this->mimeType : '';
+    }
 
-	/**
-	 * Returns the width of the image or -1 if no image is loaded.
-	 *
-	 * @return int
-	 */
-	public function width() {
-		return $this->valid() ? imagesx($this->resource) : -1;
-	}
+    /**
+     * Returns the width of the image or -1 if no image is loaded.
+     *
+     * @return int
+     */
+    public function width() {
+        return $this->valid() ? imagesx($this->resource) : -1;
+    }
 
-	/**
-	 * Returns the height of the image or -1 if no image is loaded.
-	 *
-	 * @return int
-	 */
-	public function height() {
-		return $this->valid() ? imagesy($this->resource) : -1;
-	}
+    /**
+     * Returns the height of the image or -1 if no image is loaded.
+     *
+     * @return int
+     */
+    public function height() {
+        return $this->valid() ? imagesy($this->resource) : -1;
+    }
 
-	/**
-	 * Returns the width when the image orientation is top-left.
-	 *
-	 * @return int
-	 */
-	public function widthTopLeft() {
-		$o = $this->getOrientation();
-		$this->logger->debug('OC_Image->widthTopLeft() Orientation: ' . $o, array('app' => 'core'));
-		switch ($o) {
-			case -1:
-			case 1:
-			case 2: // Not tested
-			case 3:
-			case 4: // Not tested
-				return $this->width();
-			case 5: // Not tested
-			case 6:
-			case 7: // Not tested
-			case 8:
-				return $this->height();
-		}
-		return $this->width();
-	}
+    /**
+     * Returns the width when the image orientation is top-left.
+     *
+     * @return int
+     */
+    public function widthTopLeft() {
+        $o = $this->getOrientation();
+        $this->logger->debug('OC_Image->widthTopLeft() Orientation: ' . $o, array('app' => 'core'));
+        switch ($o) {
+            case -1:
+            case 1:
+            case 2: // Not tested
+            case 3:
+            case 4: // Not tested
+                return $this->width();
+            case 5: // Not tested
+            case 6:
+            case 7: // Not tested
+            case 8:
+                return $this->height();
+        }
+        return $this->width();
+    }
 
-	/**
-	 * Returns the height when the image orientation is top-left.
-	 *
-	 * @return int
-	 */
-	public function heightTopLeft() {
-		$o = $this->getOrientation();
-		$this->logger->debug('OC_Image->heightTopLeft() Orientation: ' . $o, array('app' => 'core'));
-		switch ($o) {
-			case -1:
-			case 1:
-			case 2: // Not tested
-			case 3:
-			case 4: // Not tested
-				return $this->height();
-			case 5: // Not tested
-			case 6:
-			case 7: // Not tested
-			case 8:
-				return $this->width();
-		}
-		return $this->height();
-	}
+    /**
+     * Returns the height when the image orientation is top-left.
+     *
+     * @return int
+     */
+    public function heightTopLeft() {
+        $o = $this->getOrientation();
+        $this->logger->debug('OC_Image->heightTopLeft() Orientation: ' . $o, array('app' => 'core'));
+        switch ($o) {
+            case -1:
+            case 1:
+            case 2: // Not tested
+            case 3:
+            case 4: // Not tested
+                return $this->height();
+            case 5: // Not tested
+            case 6:
+            case 7: // Not tested
+            case 8:
+                return $this->width();
+        }
+        return $this->height();
+    }
 
-	/**
-	 * Outputs the image.
-	 *
-	 * @param string $mimeType
-	 * @return bool
-	 */
-	public function show($mimeType = null) {
-		if ($mimeType === null) {
-			$mimeType = $this->mimeType();
-		}
-		header('Content-Type: ' . $mimeType);
-		return $this->_output(null, $mimeType);
-	}
+    /**
+     * Outputs the image.
+     *
+     * @param string $mimeType
+     * @return bool
+     */
+    public function show($mimeType = null) {
+        if ($mimeType === null) {
+            $mimeType = $this->mimeType();
+        }
+        header('Content-Type: ' . $mimeType);
+        return $this->_output(null, $mimeType);
+    }
 
-	/**
-	 * Saves the image.
-	 *
-	 * @param string $filePath
-	 * @param string $mimeType
-	 * @return bool
-	 */
+    /**
+     * Saves the image.
+     *
+     * @param string $filePath
+     * @param string $mimeType
+     * @return bool
+     */
 
-	public function save($filePath = null, $mimeType = null) {
-		if ($mimeType === null) {
-			$mimeType = $this->mimeType();
-		}
-		if ($filePath === null) {
-			if ($this->filePath === null) {
-				$this->logger->error(__METHOD__ . '(): called with no path.', array('app' => 'core'));
-				return false;
-			} else {
-				$filePath = $this->filePath;
-			}
-		}
-		return $this->_output($filePath, $mimeType);
-	}
+    public function save($filePath = null, $mimeType = null) {
+        if ($mimeType === null) {
+            $mimeType = $this->mimeType();
+        }
+        if ($filePath === null) {
+            if ($this->filePath === null) {
+                $this->logger->error(__METHOD__ . '(): called with no path.', array('app' => 'core'));
+                return false;
+            } else {
+                $filePath = $this->filePath;
+            }
+        }
+        return $this->_output($filePath, $mimeType);
+    }
 
-	/**
-	 * Outputs/saves the image.
-	 *
-	 * @param string $filePath
-	 * @param string $mimeType
-	 * @return bool
-	 * @throws Exception
-	 */
-	private function _output($filePath = null, $mimeType = null) {
-		if ($filePath) {
-			if (!file_exists(dirname($filePath))) {
-				mkdir(dirname($filePath), 0777, true);
-			}
-			$isWritable = is_writable(dirname($filePath));
-			if (!$isWritable) {
-				$this->logger->error(__METHOD__ . '(): Directory \'' . dirname($filePath) . '\' is not writable.', array('app' => 'core'));
-				return false;
-			} elseif ($isWritable && file_exists($filePath) && !is_writable($filePath)) {
-				$this->logger->error(__METHOD__ . '(): File \'' . $filePath . '\' is not writable.', array('app' => 'core'));
-				return false;
-			}
-		}
-		if (!$this->valid()) {
-			return false;
-		}
+    /**
+     * Outputs/saves the image.
+     *
+     * @param string $filePath
+     * @param string $mimeType
+     * @return bool
+     * @throws Exception
+     */
+    private function _output($filePath = null, $mimeType = null) {
+        if ($filePath) {
+            if (!file_exists(dirname($filePath))) {
+                mkdir(dirname($filePath), 0777, true);
+            }
+            $isWritable = is_writable(dirname($filePath));
+            if (!$isWritable) {
+                $this->logger->error(__METHOD__ . '(): Directory \'' . dirname($filePath) . '\' is not writable.', array('app' => 'core'));
+                return false;
+            } elseif ($isWritable && file_exists($filePath) && !is_writable($filePath)) {
+                $this->logger->error(__METHOD__ . '(): File \'' . $filePath . '\' is not writable.', array('app' => 'core'));
+                return false;
+            }
+        }
+        if (!$this->valid()) {
+            return false;
+        }
 
-		$imageType = $this->imageType;
-		if ($mimeType !== null) {
-			switch ($mimeType) {
-				case 'image/gif':
-					$imageType = IMAGETYPE_GIF;
-					break;
-				case 'image/jpeg':
-					$imageType = IMAGETYPE_JPEG;
-					break;
-				case 'image/png':
-					$imageType = IMAGETYPE_PNG;
-					break;
-				case 'image/x-xbitmap':
-					$imageType = IMAGETYPE_XBM;
-					break;
-				case 'image/bmp':
-				case 'image/x-ms-bmp':
-					$imageType = IMAGETYPE_BMP;
-					break;
-				default:
-					throw new Exception('\OC_Image::_output(): "' . $mimeType . '" is not supported when forcing a specific output format');
-			}
-		}
+        $imageType = $this->imageType;
+        if ($mimeType !== null) {
+            switch ($mimeType) {
+                case 'image/gif':
+                    $imageType = IMAGETYPE_GIF;
+                    break;
+                case 'image/jpeg':
+                    $imageType = IMAGETYPE_JPEG;
+                    break;
+                case 'image/png':
+                    $imageType = IMAGETYPE_PNG;
+                    break;
+                case 'image/x-xbitmap':
+                    $imageType = IMAGETYPE_XBM;
+                    break;
+                case 'image/bmp':
+                case 'image/x-ms-bmp':
+                    $imageType = IMAGETYPE_BMP;
+                    break;
+                default:
+                    throw new Exception('\OC_Image::_output(): "' . $mimeType . '" is not supported when forcing a specific output format');
+            }
+        }
 
-		switch ($imageType) {
-			case IMAGETYPE_GIF:
-				$retVal = imagegif($this->resource, $filePath);
-				break;
-			case IMAGETYPE_JPEG:
-				$retVal = imagejpeg($this->resource, $filePath, $this->getJpegQuality());
-				break;
-			case IMAGETYPE_PNG:
-				$retVal = imagepng($this->resource, $filePath);
-				break;
-			case IMAGETYPE_XBM:
-				if (function_exists('imagexbm')) {
-					$retVal = imagexbm($this->resource, $filePath);
-				} else {
-					throw new Exception('\OC_Image::_output(): imagexbm() is not supported.');
-				}
+        switch ($imageType) {
+            case IMAGETYPE_GIF:
+                $retVal = imagegif($this->resource, $filePath);
+                break;
+            case IMAGETYPE_JPEG:
+                $retVal = imagejpeg($this->resource, $filePath, $this->getJpegQuality());
+                break;
+            case IMAGETYPE_PNG:
+                $retVal = imagepng($this->resource, $filePath);
+                break;
+            case IMAGETYPE_XBM:
+                if (function_exists('imagexbm')) {
+                    $retVal = imagexbm($this->resource, $filePath);
+                } else {
+                    throw new Exception('\OC_Image::_output(): imagexbm() is not supported.');
+                }
 
-				break;
-			case IMAGETYPE_WBMP:
-				$retVal = imagewbmp($this->resource, $filePath);
-				break;
-			case IMAGETYPE_BMP:
-				$retVal = imagebmp($this->resource, $filePath, $this->bitDepth);
-				break;
-			default:
-				$retVal = imagepng($this->resource, $filePath);
-		}
-		return $retVal;
-	}
+                break;
+            case IMAGETYPE_WBMP:
+                $retVal = imagewbmp($this->resource, $filePath);
+                break;
+            case IMAGETYPE_BMP:
+                $retVal = imagebmp($this->resource, $filePath, $this->bitDepth);
+                break;
+            default:
+                $retVal = imagepng($this->resource, $filePath);
+        }
+        return $retVal;
+    }
 
-	/**
-	 * Prints the image when called as $image().
-	 */
-	public function __invoke() {
-		return $this->show();
-	}
+    /**
+     * Prints the image when called as $image().
+     */
+    public function __invoke() {
+        return $this->show();
+    }
 
-	/**
-	 * @param resource Returns the image resource in any.
-	 * @throws \InvalidArgumentException in case the supplied resource does not have the type "gd"
-	 */
-	public function setResource($resource) {
-		if (get_resource_type($resource) === 'gd') {
-			$this->resource = $resource;
-			return;
-		}
-		throw new \InvalidArgumentException('Supplied resource is not of type "gd".');
-	}
+    /**
+     * @param resource Returns the image resource in any.
+     * @throws \InvalidArgumentException in case the supplied resource does not have the type "gd"
+     */
+    public function setResource($resource) {
+        if (get_resource_type($resource) === 'gd') {
+            $this->resource = $resource;
+            return;
+        }
+        throw new \InvalidArgumentException('Supplied resource is not of type "gd".');
+    }
 
-	/**
-	 * @return resource Returns the image resource in any.
-	 */
-	public function resource() {
-		return $this->resource;
-	}
+    /**
+     * @return resource Returns the image resource in any.
+     */
+    public function resource() {
+        return $this->resource;
+    }
 
-	/**
-	 * @return string Returns the mimetype of the data. Returns the empty string
-	 * if the data is not valid.
-	 */
-	public function dataMimeType() {
-		if (!$this->valid()) {
-			return '';
-		}
+    /**
+     * @return string Returns the mimetype of the data. Returns the empty string
+     * if the data is not valid.
+     */
+    public function dataMimeType() {
+        if (!$this->valid()) {
+            return '';
+        }
 
-		switch ($this->mimeType) {
-			case 'image/png':
-			case 'image/jpeg':
-			case 'image/gif':
-				return $this->mimeType;
-			default:
-				return 'image/png';
-		}
-	}
+        switch ($this->mimeType) {
+            case 'image/png':
+            case 'image/jpeg':
+            case 'image/gif':
+                return $this->mimeType;
+            default:
+                return 'image/png';
+        }
+    }
 
-	/**
-	 * @return null|string Returns the raw image data.
-	 */
-	public function data() {
-		if (!$this->valid()) {
-			return null;
-		}
-		ob_start();
-		switch ($this->mimeType) {
-			case "image/png":
-				$res = imagepng($this->resource);
-				break;
-			case "image/jpeg":
-				$quality = $this->getJpegQuality();
-				if ($quality !== null) {
-					$res = imagejpeg($this->resource, null, $quality);
-				} else {
-					$res = imagejpeg($this->resource);
-				}
-				break;
-			case "image/gif":
-				$res = imagegif($this->resource);
-				break;
-			default:
-				$res = imagepng($this->resource);
-				$this->logger->info('OC_Image->data. Could not guess mime-type, defaulting to png', array('app' => 'core'));
-				break;
-		}
-		if (!$res) {
-			$this->logger->error('OC_Image->data. Error getting image data.', array('app' => 'core'));
-		}
-		return ob_get_clean();
-	}
+    /**
+     * @return null|string Returns the raw image data.
+     */
+    public function data() {
+        if (!$this->valid()) {
+            return null;
+        }
+        ob_start();
+        switch ($this->mimeType) {
+            case "image/png":
+                $res = imagepng($this->resource);
+                break;
+            case "image/jpeg":
+                $quality = $this->getJpegQuality();
+                if ($quality !== null) {
+                    $res = imagejpeg($this->resource, null, $quality);
+                } else {
+                    $res = imagejpeg($this->resource);
+                }
+                break;
+            case "image/gif":
+                $res = imagegif($this->resource);
+                break;
+            default:
+                $res = imagepng($this->resource);
+                $this->logger->info('OC_Image->data. Could not guess mime-type, defaulting to png', array('app' => 'core'));
+                break;
+        }
+        if (!$res) {
+            $this->logger->error('OC_Image->data. Error getting image data.', array('app' => 'core'));
+        }
+        return ob_get_clean();
+    }
 
-	/**
-	 * @return string - base64 encoded, which is suitable for embedding in a VCard.
-	 */
-	public function __toString() {
-		return base64_encode($this->data());
-	}
+    /**
+     * @return string - base64 encoded, which is suitable for embedding in a VCard.
+     */
+    public function __toString() {
+        return base64_encode($this->data());
+    }
 
-	/**
-	 * @return int|null
-	 */
-	protected function getJpegQuality() {
-		$quality = $this->config->getAppValue('preview', 'jpeg_quality', 90);
-		if ($quality !== null) {
-			$quality = min(100, max(10, (int) $quality));
-		}
-		return $quality;
-	}
+    /**
+     * @return int|null
+     */
+    protected function getJpegQuality() {
+        $quality = $this->config->getAppValue('preview', 'jpeg_quality', 90);
+        if ($quality !== null) {
+            $quality = min(100, max(10, (int) $quality));
+        }
+        return $quality;
+    }
 
-	/**
-	 * (I'm open for suggestions on better method name ;)
-	 * Get the orientation based on EXIF data.
-	 *
-	 * @return int The orientation or -1 if no EXIF data is available.
-	 */
-	public function getOrientation() {
-		if ($this->exif !== null) {
-			return $this->exif['Orientation'];
-		}
+    /**
+     * (I'm open for suggestions on better method name ;)
+     * Get the orientation based on EXIF data.
+     *
+     * @return int The orientation or -1 if no EXIF data is available.
+     */
+    public function getOrientation() {
+        if ($this->exif !== null) {
+            return $this->exif['Orientation'];
+        }
 
-		if ($this->imageType !== IMAGETYPE_JPEG) {
-			$this->logger->debug('OC_Image->fixOrientation() Image is not a JPEG.', array('app' => 'core'));
-			return -1;
-		}
-		if (!is_callable('exif_read_data')) {
-			$this->logger->debug('OC_Image->fixOrientation() Exif module not enabled.', array('app' => 'core'));
-			return -1;
-		}
-		if (!$this->valid()) {
-			$this->logger->debug('OC_Image->fixOrientation() No image loaded.', array('app' => 'core'));
-			return -1;
-		}
-		if (is_null($this->filePath) || !is_readable($this->filePath)) {
-			$this->logger->debug('OC_Image->fixOrientation() No readable file path set.', array('app' => 'core'));
-			return -1;
-		}
-		$exif = @exif_read_data($this->filePath, 'IFD0');
-		if (!$exif) {
-			return -1;
-		}
-		if (!isset($exif['Orientation'])) {
-			return -1;
-		}
-		$this->exif = $exif;
-		return $exif['Orientation'];
-	}
+        if ($this->imageType !== IMAGETYPE_JPEG) {
+            $this->logger->debug('OC_Image->fixOrientation() Image is not a JPEG.', array('app' => 'core'));
+            return -1;
+        }
+        if (!is_callable('exif_read_data')) {
+            $this->logger->debug('OC_Image->fixOrientation() Exif module not enabled.', array('app' => 'core'));
+            return -1;
+        }
+        if (!$this->valid()) {
+            $this->logger->debug('OC_Image->fixOrientation() No image loaded.', array('app' => 'core'));
+            return -1;
+        }
+        if (is_null($this->filePath) || !is_readable($this->filePath)) {
+            $this->logger->debug('OC_Image->fixOrientation() No readable file path set.', array('app' => 'core'));
+            return -1;
+        }
+        $exif = @exif_read_data($this->filePath, 'IFD0');
+        if (!$exif) {
+            return -1;
+        }
+        if (!isset($exif['Orientation'])) {
+            return -1;
+        }
+        $this->exif = $exif;
+        return $exif['Orientation'];
+    }
 
-	public function readExif($data) {
-		if (!is_callable('exif_read_data')) {
-			$this->logger->debug('OC_Image->fixOrientation() Exif module not enabled.', array('app' => 'core'));
-			return;
-		}
-		if (!$this->valid()) {
-			$this->logger->debug('OC_Image->fixOrientation() No image loaded.', array('app' => 'core'));
-			return;
-		}
+    public function readExif($data) {
+        if (!is_callable('exif_read_data')) {
+            $this->logger->debug('OC_Image->fixOrientation() Exif module not enabled.', array('app' => 'core'));
+            return;
+        }
+        if (!$this->valid()) {
+            $this->logger->debug('OC_Image->fixOrientation() No image loaded.', array('app' => 'core'));
+            return;
+        }
 
-		$exif = @exif_read_data('data://image/jpeg;base64,' . base64_encode($data));
-		if (!$exif) {
-			return;
-		}
-		if (!isset($exif['Orientation'])) {
-			return;
-		}
-		$this->exif = $exif;
-	}
+        $exif = @exif_read_data('data://image/jpeg;base64,' . base64_encode($data));
+        if (!$exif) {
+            return;
+        }
+        if (!isset($exif['Orientation'])) {
+            return;
+        }
+        $this->exif = $exif;
+    }
 
-	/**
-	 * (I'm open for suggestions on better method name ;)
-	 * Fixes orientation based on EXIF data.
-	 *
-	 * @return bool
-	 */
-	public function fixOrientation() {
-		$o = $this->getOrientation();
-		$this->logger->debug('OC_Image->fixOrientation() Orientation: ' . $o, array('app' => 'core'));
-		$rotate = 0;
-		$flip = false;
-		switch ($o) {
-			case -1:
-				return false; //Nothing to fix
-			case 1:
-				$rotate = 0;
-				break;
-			case 2:
-				$rotate = 0;
-				$flip = true;
-				break;
-			case 3:
-				$rotate = 180;
-				break;
-			case 4:
-				$rotate = 180;
-				$flip = true;
-				break;
-			case 5:
-				$rotate = 90;
-				$flip = true;
-				break;
-			case 6:
-				$rotate = 270;
-				break;
-			case 7:
-				$rotate = 270;
-				$flip = true;
-				break;
-			case 8:
-				$rotate = 90;
-				break;
-		}
-		if($flip && function_exists('imageflip')) {
-			imageflip($this->resource, IMG_FLIP_HORIZONTAL);
-		}
-		if ($rotate) {
-			$res = imagerotate($this->resource, $rotate, 0);
-			if ($res) {
-				if (imagealphablending($res, true)) {
-					if (imagesavealpha($res, true)) {
-						imagedestroy($this->resource);
-						$this->resource = $res;
-						return true;
-					} else {
-						$this->logger->debug('OC_Image->fixOrientation() Error during alpha-saving', array('app' => 'core'));
-						return false;
-					}
-				} else {
-					$this->logger->debug('OC_Image->fixOrientation() Error during alpha-blending', array('app' => 'core'));
-					return false;
-				}
-			} else {
-				$this->logger->debug('OC_Image->fixOrientation() Error during orientation fixing', array('app' => 'core'));
-				return false;
-			}
-		}
-		return false;
-	}
+    /**
+     * (I'm open for suggestions on better method name ;)
+     * Fixes orientation based on EXIF data.
+     *
+     * @return bool
+     */
+    public function fixOrientation() {
+        $o = $this->getOrientation();
+        $this->logger->debug('OC_Image->fixOrientation() Orientation: ' . $o, array('app' => 'core'));
+        $rotate = 0;
+        $flip = false;
+        switch ($o) {
+            case -1:
+                return false; //Nothing to fix
+            case 1:
+                $rotate = 0;
+                break;
+            case 2:
+                $rotate = 0;
+                $flip = true;
+                break;
+            case 3:
+                $rotate = 180;
+                break;
+            case 4:
+                $rotate = 180;
+                $flip = true;
+                break;
+            case 5:
+                $rotate = 90;
+                $flip = true;
+                break;
+            case 6:
+                $rotate = 270;
+                break;
+            case 7:
+                $rotate = 270;
+                $flip = true;
+                break;
+            case 8:
+                $rotate = 90;
+                break;
+        }
+        if($flip && function_exists('imageflip')) {
+            imageflip($this->resource, IMG_FLIP_HORIZONTAL);
+        }
+        if ($rotate) {
+            $res = imagerotate($this->resource, $rotate, 0);
+            if ($res) {
+                if (imagealphablending($res, true)) {
+                    if (imagesavealpha($res, true)) {
+                        imagedestroy($this->resource);
+                        $this->resource = $res;
+                        return true;
+                    } else {
+                        $this->logger->debug('OC_Image->fixOrientation() Error during alpha-saving', array('app' => 'core'));
+                        return false;
+                    }
+                } else {
+                    $this->logger->debug('OC_Image->fixOrientation() Error during alpha-blending', array('app' => 'core'));
+                    return false;
+                }
+            } else {
+                $this->logger->debug('OC_Image->fixOrientation() Error during orientation fixing', array('app' => 'core'));
+                return false;
+            }
+        }
+        return false;
+    }
 
-	/**
-	 * Loads an image from an open file handle.
-	 * It is the responsibility of the caller to position the pointer at the correct place and to close the handle again.
-	 *
-	 * @param resource $handle
-	 * @return resource|false An image resource or false on error
-	 */
-	public function loadFromFileHandle($handle) {
-		$contents = stream_get_contents($handle);
-		if ($this->loadFromData($contents)) {
-			return $this->resource;
-		}
-		return false;
-	}
+    /**
+     * Loads an image from an open file handle.
+     * It is the responsibility of the caller to position the pointer at the correct place and to close the handle again.
+     *
+     * @param resource $handle
+     * @return resource|false An image resource or false on error
+     */
+    public function loadFromFileHandle($handle) {
+        $contents = stream_get_contents($handle);
+        if ($this->loadFromData($contents)) {
+            return $this->resource;
+        }
+        return false;
+    }
 
-	/**
-	 * Loads an image from a local file.
-	 *
-	 * @param bool|string $imagePath The path to a local file.
-	 * @return bool|resource An image resource or false on error
-	 */
-	public function loadFromFile($imagePath = false) {
-		// exif_imagetype throws "read error!" if file is less than 12 byte
-		if (!@is_file($imagePath) || !file_exists($imagePath) || filesize($imagePath) < 12 || !is_readable($imagePath)) {
-			return false;
-		}
-		$iType = exif_imagetype($imagePath);
-		switch ($iType) {
-			case IMAGETYPE_GIF:
-				if (imagetypes() & IMG_GIF) {
-					$this->resource = imagecreatefromgif($imagePath);
-					// Preserve transparency
-					imagealphablending($this->resource, true);
-					imagesavealpha($this->resource, true);
-				} else {
-					$this->logger->debug('OC_Image->loadFromFile, GIF images not supported: ' . $imagePath, array('app' => 'core'));
-				}
-				break;
-			case IMAGETYPE_JPEG:
-				if (imagetypes() & IMG_JPG) {
-					if (getimagesize($imagePath) !== false) {
-						$this->resource = @imagecreatefromjpeg($imagePath);
-					} else {
-						$this->logger->debug('OC_Image->loadFromFile, JPG image not valid: ' . $imagePath, array('app' => 'core'));
-					}
-				} else {
-					$this->logger->debug('OC_Image->loadFromFile, JPG images not supported: ' . $imagePath, array('app' => 'core'));
-				}
-				break;
-			case IMAGETYPE_PNG:
-				if (imagetypes() & IMG_PNG) {
-					$this->resource = @imagecreatefrompng($imagePath);
-					// Preserve transparency
-					imagealphablending($this->resource, true);
-					imagesavealpha($this->resource, true);
-				} else {
-					$this->logger->debug('OC_Image->loadFromFile, PNG images not supported: ' . $imagePath, array('app' => 'core'));
-				}
-				break;
-			case IMAGETYPE_XBM:
-				if (imagetypes() & IMG_XPM) {
-					$this->resource = @imagecreatefromxbm($imagePath);
-				} else {
-					$this->logger->debug('OC_Image->loadFromFile, XBM/XPM images not supported: ' . $imagePath, array('app' => 'core'));
-				}
-				break;
-			case IMAGETYPE_WBMP:
-				if (imagetypes() & IMG_WBMP) {
-					$this->resource = @imagecreatefromwbmp($imagePath);
-				} else {
-					$this->logger->debug('OC_Image->loadFromFile, WBMP images not supported: ' . $imagePath, array('app' => 'core'));
-				}
-				break;
-			case IMAGETYPE_BMP:
-				$this->resource = $this->imagecreatefrombmp($imagePath);
-				break;
-			/*
+    /**
+     * Loads an image from a local file.
+     *
+     * @param bool|string $imagePath The path to a local file.
+     * @return bool|resource An image resource or false on error
+     */
+    public function loadFromFile($imagePath = false) {
+        // exif_imagetype throws "read error!" if file is less than 12 byte
+        if (!@is_file($imagePath) || !file_exists($imagePath) || filesize($imagePath) < 12 || !is_readable($imagePath)) {
+            return false;
+        }
+        $iType = exif_imagetype($imagePath);
+        switch ($iType) {
+            case IMAGETYPE_GIF:
+                if (imagetypes() & IMG_GIF) {
+                    $this->resource = imagecreatefromgif($imagePath);
+                    // Preserve transparency
+                    imagealphablending($this->resource, true);
+                    imagesavealpha($this->resource, true);
+                } else {
+                    $this->logger->debug('OC_Image->loadFromFile, GIF images not supported: ' . $imagePath, array('app' => 'core'));
+                }
+                break;
+            case IMAGETYPE_JPEG:
+                if (imagetypes() & IMG_JPG) {
+                    if (getimagesize($imagePath) !== false) {
+                        $this->resource = @imagecreatefromjpeg($imagePath);
+                    } else {
+                        $this->logger->debug('OC_Image->loadFromFile, JPG image not valid: ' . $imagePath, array('app' => 'core'));
+                    }
+                } else {
+                    $this->logger->debug('OC_Image->loadFromFile, JPG images not supported: ' . $imagePath, array('app' => 'core'));
+                }
+                break;
+            case IMAGETYPE_PNG:
+                if (imagetypes() & IMG_PNG) {
+                    $this->resource = @imagecreatefrompng($imagePath);
+                    // Preserve transparency
+                    imagealphablending($this->resource, true);
+                    imagesavealpha($this->resource, true);
+                } else {
+                    $this->logger->debug('OC_Image->loadFromFile, PNG images not supported: ' . $imagePath, array('app' => 'core'));
+                }
+                break;
+            case IMAGETYPE_XBM:
+                if (imagetypes() & IMG_XPM) {
+                    $this->resource = @imagecreatefromxbm($imagePath);
+                } else {
+                    $this->logger->debug('OC_Image->loadFromFile, XBM/XPM images not supported: ' . $imagePath, array('app' => 'core'));
+                }
+                break;
+            case IMAGETYPE_WBMP:
+                if (imagetypes() & IMG_WBMP) {
+                    $this->resource = @imagecreatefromwbmp($imagePath);
+                } else {
+                    $this->logger->debug('OC_Image->loadFromFile, WBMP images not supported: ' . $imagePath, array('app' => 'core'));
+                }
+                break;
+            case IMAGETYPE_BMP:
+                $this->resource = $this->imagecreatefrombmp($imagePath);
+                break;
+            /*
 			case IMAGETYPE_TIFF_II: // (intel byte order)
 				break;
 			case IMAGETYPE_TIFF_MM: // (motorola byte order)
@@ -616,581 +616,581 @@ 
 			case IMAGETYPE_PSD:
 				break;
 			*/
-			default:
+            default:
 
-				// this is mostly file created from encrypted file
-				$this->resource = imagecreatefromstring(\OC\Files\Filesystem::file_get_contents(\OC\Files\Filesystem::getLocalPath($imagePath)));
-				$iType = IMAGETYPE_PNG;
-				$this->logger->debug('OC_Image->loadFromFile, Default', array('app' => 'core'));
-				break;
-		}
-		if ($this->valid()) {
-			$this->imageType = $iType;
-			$this->mimeType = image_type_to_mime_type($iType);
-			$this->filePath = $imagePath;
-		}
-		return $this->resource;
-	}
+                // this is mostly file created from encrypted file
+                $this->resource = imagecreatefromstring(\OC\Files\Filesystem::file_get_contents(\OC\Files\Filesystem::getLocalPath($imagePath)));
+                $iType = IMAGETYPE_PNG;
+                $this->logger->debug('OC_Image->loadFromFile, Default', array('app' => 'core'));
+                break;
+        }
+        if ($this->valid()) {
+            $this->imageType = $iType;
+            $this->mimeType = image_type_to_mime_type($iType);
+            $this->filePath = $imagePath;
+        }
+        return $this->resource;
+    }
 
-	/**
-	 * Loads an image from a string of data.
-	 *
-	 * @param string $str A string of image data as read from a file.
-	 * @return bool|resource An image resource or false on error
-	 */
-	public function loadFromData($str) {
-		if (is_resource($str)) {
-			return false;
-		}
-		$this->resource = @imagecreatefromstring($str);
-		if ($this->fileInfo) {
-			$this->mimeType = $this->fileInfo->buffer($str);
-		}
-		if (is_resource($this->resource)) {
-			imagealphablending($this->resource, false);
-			imagesavealpha($this->resource, true);
-		}
+    /**
+     * Loads an image from a string of data.
+     *
+     * @param string $str A string of image data as read from a file.
+     * @return bool|resource An image resource or false on error
+     */
+    public function loadFromData($str) {
+        if (is_resource($str)) {
+            return false;
+        }
+        $this->resource = @imagecreatefromstring($str);
+        if ($this->fileInfo) {
+            $this->mimeType = $this->fileInfo->buffer($str);
+        }
+        if (is_resource($this->resource)) {
+            imagealphablending($this->resource, false);
+            imagesavealpha($this->resource, true);
+        }
 
-		if (!$this->resource) {
-			$this->logger->debug('OC_Image->loadFromFile, could not load', array('app' => 'core'));
-			return false;
-		}
-		return $this->resource;
-	}
+        if (!$this->resource) {
+            $this->logger->debug('OC_Image->loadFromFile, could not load', array('app' => 'core'));
+            return false;
+        }
+        return $this->resource;
+    }
 
-	/**
-	 * Loads an image from a base64 encoded string.
-	 *
-	 * @param string $str A string base64 encoded string of image data.
-	 * @return bool|resource An image resource or false on error
-	 */
-	public function loadFromBase64($str) {
-		if (!is_string($str)) {
-			return false;
-		}
-		$data = base64_decode($str);
-		if ($data) { // try to load from string data
-			$this->resource = @imagecreatefromstring($data);
-			if ($this->fileInfo) {
-				$this->mimeType = $this->fileInfo->buffer($data);
-			}
-			if (!$this->resource) {
-				$this->logger->debug('OC_Image->loadFromBase64, could not load', array('app' => 'core'));
-				return false;
-			}
-			return $this->resource;
-		} else {
-			return false;
-		}
-	}
+    /**
+     * Loads an image from a base64 encoded string.
+     *
+     * @param string $str A string base64 encoded string of image data.
+     * @return bool|resource An image resource or false on error
+     */
+    public function loadFromBase64($str) {
+        if (!is_string($str)) {
+            return false;
+        }
+        $data = base64_decode($str);
+        if ($data) { // try to load from string data
+            $this->resource = @imagecreatefromstring($data);
+            if ($this->fileInfo) {
+                $this->mimeType = $this->fileInfo->buffer($data);
+            }
+            if (!$this->resource) {
+                $this->logger->debug('OC_Image->loadFromBase64, could not load', array('app' => 'core'));
+                return false;
+            }
+            return $this->resource;
+        } else {
+            return false;
+        }
+    }
 
-	/**
-	 * Create a new image from file or URL
-	 *
-	 * @link http://www.programmierer-forum.de/function-imagecreatefrombmp-laeuft-mit-allen-bitraten-t143137.htm
-	 * @version 1.00
-	 * @param string $fileName <p>
-	 * Path to the BMP image.
-	 * </p>
-	 * @return bool|resource an image resource identifier on success, <b>FALSE</b> on errors.
-	 */
-	private function imagecreatefrombmp($fileName) {
-		if (!($fh = fopen($fileName, 'rb'))) {
-			$this->logger->warning('imagecreatefrombmp: Can not open ' . $fileName, array('app' => 'core'));
-			return false;
-		}
-		// read file header
-		$meta = unpack('vtype/Vfilesize/Vreserved/Voffset', fread($fh, 14));
-		// check for bitmap
-		if ($meta['type'] != 19778) {
-			fclose($fh);
-			$this->logger->warning('imagecreatefrombmp: Can not open ' . $fileName . ' is not a bitmap!', array('app' => 'core'));
-			return false;
-		}
-		// read image header
-		$meta += unpack('Vheadersize/Vwidth/Vheight/vplanes/vbits/Vcompression/Vimagesize/Vxres/Vyres/Vcolors/Vimportant', fread($fh, 40));
-		// read additional 16bit header
-		if ($meta['bits'] == 16) {
-			$meta += unpack('VrMask/VgMask/VbMask', fread($fh, 12));
-		}
-		// set bytes and padding
-		$meta['bytes'] = $meta['bits'] / 8;
-		$this->bitDepth = $meta['bits']; //remember the bit depth for the imagebmp call
-		$meta['decal'] = 4 - (4 * (($meta['width'] * $meta['bytes'] / 4) - floor($meta['width'] * $meta['bytes'] / 4)));
-		if ($meta['decal'] == 4) {
-			$meta['decal'] = 0;
-		}
-		// obtain imagesize
-		if ($meta['imagesize'] < 1) {
-			$meta['imagesize'] = $meta['filesize'] - $meta['offset'];
-			// in rare cases filesize is equal to offset so we need to read physical size
-			if ($meta['imagesize'] < 1) {
-				$meta['imagesize'] = @filesize($fileName) - $meta['offset'];
-				if ($meta['imagesize'] < 1) {
-					fclose($fh);
-					$this->logger->warning('imagecreatefrombmp: Can not obtain file size of ' . $fileName . ' is not a bitmap!', array('app' => 'core'));
-					return false;
-				}
-			}
-		}
-		// calculate colors
-		$meta['colors'] = !$meta['colors'] ? pow(2, $meta['bits']) : $meta['colors'];
-		// read color palette
-		$palette = array();
-		if ($meta['bits'] < 16) {
-			$palette = unpack('l' . $meta['colors'], fread($fh, $meta['colors'] * 4));
-			// in rare cases the color value is signed
-			if ($palette[1] < 0) {
-				foreach ($palette as $i => $color) {
-					$palette[$i] = $color + 16777216;
-				}
-			}
-		}
-		// create gd image
-		$im = imagecreatetruecolor($meta['width'], $meta['height']);
-		if ($im == false) {
-			fclose($fh);
-			$this->logger->warning(
-				'imagecreatefrombmp: imagecreatetruecolor failed for file "' . $fileName . '" with dimensions ' . $meta['width'] . 'x' . $meta['height'],
-				array('app' => 'core'));
-			return false;
-		}
+    /**
+     * Create a new image from file or URL
+     *
+     * @link http://www.programmierer-forum.de/function-imagecreatefrombmp-laeuft-mit-allen-bitraten-t143137.htm
+     * @version 1.00
+     * @param string $fileName <p>
+     * Path to the BMP image.
+     * </p>
+     * @return bool|resource an image resource identifier on success, <b>FALSE</b> on errors.
+     */
+    private function imagecreatefrombmp($fileName) {
+        if (!($fh = fopen($fileName, 'rb'))) {
+            $this->logger->warning('imagecreatefrombmp: Can not open ' . $fileName, array('app' => 'core'));
+            return false;
+        }
+        // read file header
+        $meta = unpack('vtype/Vfilesize/Vreserved/Voffset', fread($fh, 14));
+        // check for bitmap
+        if ($meta['type'] != 19778) {
+            fclose($fh);
+            $this->logger->warning('imagecreatefrombmp: Can not open ' . $fileName . ' is not a bitmap!', array('app' => 'core'));
+            return false;
+        }
+        // read image header
+        $meta += unpack('Vheadersize/Vwidth/Vheight/vplanes/vbits/Vcompression/Vimagesize/Vxres/Vyres/Vcolors/Vimportant', fread($fh, 40));
+        // read additional 16bit header
+        if ($meta['bits'] == 16) {
+            $meta += unpack('VrMask/VgMask/VbMask', fread($fh, 12));
+        }
+        // set bytes and padding
+        $meta['bytes'] = $meta['bits'] / 8;
+        $this->bitDepth = $meta['bits']; //remember the bit depth for the imagebmp call
+        $meta['decal'] = 4 - (4 * (($meta['width'] * $meta['bytes'] / 4) - floor($meta['width'] * $meta['bytes'] / 4)));
+        if ($meta['decal'] == 4) {
+            $meta['decal'] = 0;
+        }
+        // obtain imagesize
+        if ($meta['imagesize'] < 1) {
+            $meta['imagesize'] = $meta['filesize'] - $meta['offset'];
+            // in rare cases filesize is equal to offset so we need to read physical size
+            if ($meta['imagesize'] < 1) {
+                $meta['imagesize'] = @filesize($fileName) - $meta['offset'];
+                if ($meta['imagesize'] < 1) {
+                    fclose($fh);
+                    $this->logger->warning('imagecreatefrombmp: Can not obtain file size of ' . $fileName . ' is not a bitmap!', array('app' => 'core'));
+                    return false;
+                }
+            }
+        }
+        // calculate colors
+        $meta['colors'] = !$meta['colors'] ? pow(2, $meta['bits']) : $meta['colors'];
+        // read color palette
+        $palette = array();
+        if ($meta['bits'] < 16) {
+            $palette = unpack('l' . $meta['colors'], fread($fh, $meta['colors'] * 4));
+            // in rare cases the color value is signed
+            if ($palette[1] < 0) {
+                foreach ($palette as $i => $color) {
+                    $palette[$i] = $color + 16777216;
+                }
+            }
+        }
+        // create gd image
+        $im = imagecreatetruecolor($meta['width'], $meta['height']);
+        if ($im == false) {
+            fclose($fh);
+            $this->logger->warning(
+                'imagecreatefrombmp: imagecreatetruecolor failed for file "' . $fileName . '" with dimensions ' . $meta['width'] . 'x' . $meta['height'],
+                array('app' => 'core'));
+            return false;
+        }
 
-		$data = fread($fh, $meta['imagesize']);
-		$p = 0;
-		$vide = chr(0);
-		$y = $meta['height'] - 1;
-		$error = 'imagecreatefrombmp: ' . $fileName . ' has not enough data!';
-		// loop through the image data beginning with the lower left corner
-		while ($y >= 0) {
-			$x = 0;
-			while ($x < $meta['width']) {
-				switch ($meta['bits']) {
-					case 32:
-					case 24:
-						if (!($part = substr($data, $p, 3))) {
-							$this->logger->warning($error, array('app' => 'core'));
-							return $im;
-						}
-						$color = @unpack('V', $part . $vide);
-						break;
-					case 16:
-						if (!($part = substr($data, $p, 2))) {
-							fclose($fh);
-							$this->logger->warning($error, array('app' => 'core'));
-							return $im;
-						}
-						$color = @unpack('v', $part);
-						$color[1] = (($color[1] & 0xf800) >> 8) * 65536 + (($color[1] & 0x07e0) >> 3) * 256 + (($color[1] & 0x001f) << 3);
-						break;
-					case 8:
-						$color = @unpack('n', $vide . substr($data, $p, 1));
-						$color[1] = (isset($palette[$color[1] + 1])) ? $palette[$color[1] + 1] : $palette[1];
-						break;
-					case 4:
-						$color = @unpack('n', $vide . substr($data, floor($p), 1));
-						$color[1] = ($p * 2) % 2 == 0 ? $color[1] >> 4 : $color[1] & 0x0F;
-						$color[1] = (isset($palette[$color[1] + 1])) ? $palette[$color[1] + 1] : $palette[1];
-						break;
-					case 1:
-						$color = @unpack('n', $vide . substr($data, floor($p), 1));
-						switch (($p * 8) % 8) {
-							case 0:
-								$color[1] = $color[1] >> 7;
-								break;
-							case 1:
-								$color[1] = ($color[1] & 0x40) >> 6;
-								break;
-							case 2:
-								$color[1] = ($color[1] & 0x20) >> 5;
-								break;
-							case 3:
-								$color[1] = ($color[1] & 0x10) >> 4;
-								break;
-							case 4:
-								$color[1] = ($color[1] & 0x8) >> 3;
-								break;
-							case 5:
-								$color[1] = ($color[1] & 0x4) >> 2;
-								break;
-							case 6:
-								$color[1] = ($color[1] & 0x2) >> 1;
-								break;
-							case 7:
-								$color[1] = ($color[1] & 0x1);
-								break;
-						}
-						$color[1] = (isset($palette[$color[1] + 1])) ? $palette[$color[1] + 1] : $palette[1];
-						break;
-					default:
-						fclose($fh);
-						$this->logger->warning('imagecreatefrombmp: ' . $fileName . ' has ' . $meta['bits'] . ' bits and this is not supported!', array('app' => 'core'));
-						return false;
-				}
-				imagesetpixel($im, $x, $y, $color[1]);
-				$x++;
-				$p += $meta['bytes'];
-			}
-			$y--;
-			$p += $meta['decal'];
-		}
-		fclose($fh);
-		return $im;
-	}
+        $data = fread($fh, $meta['imagesize']);
+        $p = 0;
+        $vide = chr(0);
+        $y = $meta['height'] - 1;
+        $error = 'imagecreatefrombmp: ' . $fileName . ' has not enough data!';
+        // loop through the image data beginning with the lower left corner
+        while ($y >= 0) {
+            $x = 0;
+            while ($x < $meta['width']) {
+                switch ($meta['bits']) {
+                    case 32:
+                    case 24:
+                        if (!($part = substr($data, $p, 3))) {
+                            $this->logger->warning($error, array('app' => 'core'));
+                            return $im;
+                        }
+                        $color = @unpack('V', $part . $vide);
+                        break;
+                    case 16:
+                        if (!($part = substr($data, $p, 2))) {
+                            fclose($fh);
+                            $this->logger->warning($error, array('app' => 'core'));
+                            return $im;
+                        }
+                        $color = @unpack('v', $part);
+                        $color[1] = (($color[1] & 0xf800) >> 8) * 65536 + (($color[1] & 0x07e0) >> 3) * 256 + (($color[1] & 0x001f) << 3);
+                        break;
+                    case 8:
+                        $color = @unpack('n', $vide . substr($data, $p, 1));
+                        $color[1] = (isset($palette[$color[1] + 1])) ? $palette[$color[1] + 1] : $palette[1];
+                        break;
+                    case 4:
+                        $color = @unpack('n', $vide . substr($data, floor($p), 1));
+                        $color[1] = ($p * 2) % 2 == 0 ? $color[1] >> 4 : $color[1] & 0x0F;
+                        $color[1] = (isset($palette[$color[1] + 1])) ? $palette[$color[1] + 1] : $palette[1];
+                        break;
+                    case 1:
+                        $color = @unpack('n', $vide . substr($data, floor($p), 1));
+                        switch (($p * 8) % 8) {
+                            case 0:
+                                $color[1] = $color[1] >> 7;
+                                break;
+                            case 1:
+                                $color[1] = ($color[1] & 0x40) >> 6;
+                                break;
+                            case 2:
+                                $color[1] = ($color[1] & 0x20) >> 5;
+                                break;
+                            case 3:
+                                $color[1] = ($color[1] & 0x10) >> 4;
+                                break;
+                            case 4:
+                                $color[1] = ($color[1] & 0x8) >> 3;
+                                break;
+                            case 5:
+                                $color[1] = ($color[1] & 0x4) >> 2;
+                                break;
+                            case 6:
+                                $color[1] = ($color[1] & 0x2) >> 1;
+                                break;
+                            case 7:
+                                $color[1] = ($color[1] & 0x1);
+                                break;
+                        }
+                        $color[1] = (isset($palette[$color[1] + 1])) ? $palette[$color[1] + 1] : $palette[1];
+                        break;
+                    default:
+                        fclose($fh);
+                        $this->logger->warning('imagecreatefrombmp: ' . $fileName . ' has ' . $meta['bits'] . ' bits and this is not supported!', array('app' => 'core'));
+                        return false;
+                }
+                imagesetpixel($im, $x, $y, $color[1]);
+                $x++;
+                $p += $meta['bytes'];
+            }
+            $y--;
+            $p += $meta['decal'];
+        }
+        fclose($fh);
+        return $im;
+    }
 
-	/**
-	 * Resizes the image preserving ratio.
-	 *
-	 * @param integer $maxSize The maximum size of either the width or height.
-	 * @return bool
-	 */
-	public function resize($maxSize) {
-		if (!$this->valid()) {
-			$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
-			return false;
-		}
-		$widthOrig = imagesx($this->resource);
-		$heightOrig = imagesy($this->resource);
-		$ratioOrig = $widthOrig / $heightOrig;
+    /**
+     * Resizes the image preserving ratio.
+     *
+     * @param integer $maxSize The maximum size of either the width or height.
+     * @return bool
+     */
+    public function resize($maxSize) {
+        if (!$this->valid()) {
+            $this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
+            return false;
+        }
+        $widthOrig = imagesx($this->resource);
+        $heightOrig = imagesy($this->resource);
+        $ratioOrig = $widthOrig / $heightOrig;
 
-		if ($ratioOrig > 1) {
-			$newHeight = round($maxSize / $ratioOrig);
-			$newWidth = $maxSize;
-		} else {
-			$newWidth = round($maxSize * $ratioOrig);
-			$newHeight = $maxSize;
-		}
+        if ($ratioOrig > 1) {
+            $newHeight = round($maxSize / $ratioOrig);
+            $newWidth = $maxSize;
+        } else {
+            $newWidth = round($maxSize * $ratioOrig);
+            $newHeight = $maxSize;
+        }
 
-		$this->preciseResize((int)round($newWidth), (int)round($newHeight));
-		return true;
-	}
+        $this->preciseResize((int)round($newWidth), (int)round($newHeight));
+        return true;
+    }
 
-	/**
-	 * @param int $width
-	 * @param int $height
-	 * @return bool
-	 */
-	public function preciseResize(int $width, int $height): bool {
-		if (!$this->valid()) {
-			$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
-			return false;
-		}
-		$widthOrig = imagesx($this->resource);
-		$heightOrig = imagesy($this->resource);
-		$process = imagecreatetruecolor($width, $height);
+    /**
+     * @param int $width
+     * @param int $height
+     * @return bool
+     */
+    public function preciseResize(int $width, int $height): bool {
+        if (!$this->valid()) {
+            $this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
+            return false;
+        }
+        $widthOrig = imagesx($this->resource);
+        $heightOrig = imagesy($this->resource);
+        $process = imagecreatetruecolor($width, $height);
 
-		if ($process == false) {
-			$this->logger->error(__METHOD__ . '(): Error creating true color image', array('app' => 'core'));
-			imagedestroy($process);
-			return false;
-		}
+        if ($process == false) {
+            $this->logger->error(__METHOD__ . '(): Error creating true color image', array('app' => 'core'));
+            imagedestroy($process);
+            return false;
+        }
 
-		// preserve transparency
-		if ($this->imageType == IMAGETYPE_GIF or $this->imageType == IMAGETYPE_PNG) {
-			imagecolortransparent($process, imagecolorallocatealpha($process, 0, 0, 0, 127));
-			imagealphablending($process, false);
-			imagesavealpha($process, true);
-		}
+        // preserve transparency
+        if ($this->imageType == IMAGETYPE_GIF or $this->imageType == IMAGETYPE_PNG) {
+            imagecolortransparent($process, imagecolorallocatealpha($process, 0, 0, 0, 127));
+            imagealphablending($process, false);
+            imagesavealpha($process, true);
+        }
 
-		imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $width, $height, $widthOrig, $heightOrig);
-		if ($process == false) {
-			$this->logger->error(__METHOD__ . '(): Error re-sampling process image', array('app' => 'core'));
-			imagedestroy($process);
-			return false;
-		}
-		imagedestroy($this->resource);
-		$this->resource = $process;
-		return true;
-	}
+        imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $width, $height, $widthOrig, $heightOrig);
+        if ($process == false) {
+            $this->logger->error(__METHOD__ . '(): Error re-sampling process image', array('app' => 'core'));
+            imagedestroy($process);
+            return false;
+        }
+        imagedestroy($this->resource);
+        $this->resource = $process;
+        return true;
+    }
 
-	/**
-	 * Crops the image to the middle square. If the image is already square it just returns.
-	 *
-	 * @param int $size maximum size for the result (optional)
-	 * @return bool for success or failure
-	 */
-	public function centerCrop($size = 0) {
-		if (!$this->valid()) {
-			$this->logger->error('OC_Image->centerCrop, No image loaded', array('app' => 'core'));
-			return false;
-		}
-		$widthOrig = imagesx($this->resource);
-		$heightOrig = imagesy($this->resource);
-		if ($widthOrig === $heightOrig and $size == 0) {
-			return true;
-		}
-		$ratioOrig = $widthOrig / $heightOrig;
-		$width = $height = min($widthOrig, $heightOrig);
+    /**
+     * Crops the image to the middle square. If the image is already square it just returns.
+     *
+     * @param int $size maximum size for the result (optional)
+     * @return bool for success or failure
+     */
+    public function centerCrop($size = 0) {
+        if (!$this->valid()) {
+            $this->logger->error('OC_Image->centerCrop, No image loaded', array('app' => 'core'));
+            return false;
+        }
+        $widthOrig = imagesx($this->resource);
+        $heightOrig = imagesy($this->resource);
+        if ($widthOrig === $heightOrig and $size == 0) {
+            return true;
+        }
+        $ratioOrig = $widthOrig / $heightOrig;
+        $width = $height = min($widthOrig, $heightOrig);
 
-		if ($ratioOrig > 1) {
-			$x = ($widthOrig / 2) - ($width / 2);
-			$y = 0;
-		} else {
-			$y = ($heightOrig / 2) - ($height / 2);
-			$x = 0;
-		}
-		if ($size > 0) {
-			$targetWidth = $size;
-			$targetHeight = $size;
-		} else {
-			$targetWidth = $width;
-			$targetHeight = $height;
-		}
-		$process = imagecreatetruecolor($targetWidth, $targetHeight);
-		if ($process == false) {
-			$this->logger->error('OC_Image->centerCrop, Error creating true color image', array('app' => 'core'));
-			imagedestroy($process);
-			return false;
-		}
+        if ($ratioOrig > 1) {
+            $x = ($widthOrig / 2) - ($width / 2);
+            $y = 0;
+        } else {
+            $y = ($heightOrig / 2) - ($height / 2);
+            $x = 0;
+        }
+        if ($size > 0) {
+            $targetWidth = $size;
+            $targetHeight = $size;
+        } else {
+            $targetWidth = $width;
+            $targetHeight = $height;
+        }
+        $process = imagecreatetruecolor($targetWidth, $targetHeight);
+        if ($process == false) {
+            $this->logger->error('OC_Image->centerCrop, Error creating true color image', array('app' => 'core'));
+            imagedestroy($process);
+            return false;
+        }
 
-		// preserve transparency
-		if ($this->imageType == IMAGETYPE_GIF or $this->imageType == IMAGETYPE_PNG) {
-			imagecolortransparent($process, imagecolorallocatealpha($process, 0, 0, 0, 127));
-			imagealphablending($process, false);
-			imagesavealpha($process, true);
-		}
+        // preserve transparency
+        if ($this->imageType == IMAGETYPE_GIF or $this->imageType == IMAGETYPE_PNG) {
+            imagecolortransparent($process, imagecolorallocatealpha($process, 0, 0, 0, 127));
+            imagealphablending($process, false);
+            imagesavealpha($process, true);
+        }
 
-		imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $targetWidth, $targetHeight, $width, $height);
-		if ($process == false) {
-			$this->logger->error('OC_Image->centerCrop, Error re-sampling process image ' . $width . 'x' . $height, array('app' => 'core'));
-			imagedestroy($process);
-			return false;
-		}
-		imagedestroy($this->resource);
-		$this->resource = $process;
-		return true;
-	}
+        imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $targetWidth, $targetHeight, $width, $height);
+        if ($process == false) {
+            $this->logger->error('OC_Image->centerCrop, Error re-sampling process image ' . $width . 'x' . $height, array('app' => 'core'));
+            imagedestroy($process);
+            return false;
+        }
+        imagedestroy($this->resource);
+        $this->resource = $process;
+        return true;
+    }
 
-	/**
-	 * Crops the image from point $x$y with dimension $wx$h.
-	 *
-	 * @param int $x Horizontal position
-	 * @param int $y Vertical position
-	 * @param int $w Width
-	 * @param int $h Height
-	 * @return bool for success or failure
-	 */
-	public function crop(int $x, int $y, int $w, int $h): bool {
-		if (!$this->valid()) {
-			$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
-			return false;
-		}
-		$process = imagecreatetruecolor($w, $h);
-		if ($process == false) {
-			$this->logger->error(__METHOD__ . '(): Error creating true color image', array('app' => 'core'));
-			imagedestroy($process);
-			return false;
-		}
+    /**
+     * Crops the image from point $x$y with dimension $wx$h.
+     *
+     * @param int $x Horizontal position
+     * @param int $y Vertical position
+     * @param int $w Width
+     * @param int $h Height
+     * @return bool for success or failure
+     */
+    public function crop(int $x, int $y, int $w, int $h): bool {
+        if (!$this->valid()) {
+            $this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
+            return false;
+        }
+        $process = imagecreatetruecolor($w, $h);
+        if ($process == false) {
+            $this->logger->error(__METHOD__ . '(): Error creating true color image', array('app' => 'core'));
+            imagedestroy($process);
+            return false;
+        }
 
-		// preserve transparency
-		if ($this->imageType == IMAGETYPE_GIF or $this->imageType == IMAGETYPE_PNG) {
-			imagecolortransparent($process, imagecolorallocatealpha($process, 0, 0, 0, 127));
-			imagealphablending($process, false);
-			imagesavealpha($process, true);
-		}
+        // preserve transparency
+        if ($this->imageType == IMAGETYPE_GIF or $this->imageType == IMAGETYPE_PNG) {
+            imagecolortransparent($process, imagecolorallocatealpha($process, 0, 0, 0, 127));
+            imagealphablending($process, false);
+            imagesavealpha($process, true);
+        }
 
-		imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $w, $h, $w, $h);
-		if ($process == false) {
-			$this->logger->error(__METHOD__ . '(): Error re-sampling process image ' . $w . 'x' . $h, array('app' => 'core'));
-			imagedestroy($process);
-			return false;
-		}
-		imagedestroy($this->resource);
-		$this->resource = $process;
-		return true;
-	}
+        imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $w, $h, $w, $h);
+        if ($process == false) {
+            $this->logger->error(__METHOD__ . '(): Error re-sampling process image ' . $w . 'x' . $h, array('app' => 'core'));
+            imagedestroy($process);
+            return false;
+        }
+        imagedestroy($this->resource);
+        $this->resource = $process;
+        return true;
+    }
 
-	/**
-	 * Resizes the image to fit within a boundary while preserving ratio.
-	 *
-	 * Warning: Images smaller than $maxWidth x $maxHeight will end up being scaled up
-	 *
-	 * @param integer $maxWidth
-	 * @param integer $maxHeight
-	 * @return bool
-	 */
-	public function fitIn($maxWidth, $maxHeight) {
-		if (!$this->valid()) {
-			$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
-			return false;
-		}
-		$widthOrig = imagesx($this->resource);
-		$heightOrig = imagesy($this->resource);
-		$ratio = $widthOrig / $heightOrig;
+    /**
+     * Resizes the image to fit within a boundary while preserving ratio.
+     *
+     * Warning: Images smaller than $maxWidth x $maxHeight will end up being scaled up
+     *
+     * @param integer $maxWidth
+     * @param integer $maxHeight
+     * @return bool
+     */
+    public function fitIn($maxWidth, $maxHeight) {
+        if (!$this->valid()) {
+            $this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
+            return false;
+        }
+        $widthOrig = imagesx($this->resource);
+        $heightOrig = imagesy($this->resource);
+        $ratio = $widthOrig / $heightOrig;
 
-		$newWidth = min($maxWidth, $ratio * $maxHeight);
-		$newHeight = min($maxHeight, $maxWidth / $ratio);
+        $newWidth = min($maxWidth, $ratio * $maxHeight);
+        $newHeight = min($maxHeight, $maxWidth / $ratio);
 
-		$this->preciseResize((int)round($newWidth), (int)round($newHeight));
-		return true;
-	}
+        $this->preciseResize((int)round($newWidth), (int)round($newHeight));
+        return true;
+    }
 
-	/**
-	 * Shrinks larger images to fit within specified boundaries while preserving ratio.
-	 *
-	 * @param integer $maxWidth
-	 * @param integer $maxHeight
-	 * @return bool
-	 */
-	public function scaleDownToFit($maxWidth, $maxHeight) {
-		if (!$this->valid()) {
-			$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
-			return false;
-		}
-		$widthOrig = imagesx($this->resource);
-		$heightOrig = imagesy($this->resource);
+    /**
+     * Shrinks larger images to fit within specified boundaries while preserving ratio.
+     *
+     * @param integer $maxWidth
+     * @param integer $maxHeight
+     * @return bool
+     */
+    public function scaleDownToFit($maxWidth, $maxHeight) {
+        if (!$this->valid()) {
+            $this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
+            return false;
+        }
+        $widthOrig = imagesx($this->resource);
+        $heightOrig = imagesy($this->resource);
 
-		if ($widthOrig > $maxWidth || $heightOrig > $maxHeight) {
-			return $this->fitIn($maxWidth, $maxHeight);
-		}
+        if ($widthOrig > $maxWidth || $heightOrig > $maxHeight) {
+            return $this->fitIn($maxWidth, $maxHeight);
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	/**
-	 * Destroys the current image and resets the object
-	 */
-	public function destroy() {
-		if ($this->valid()) {
-			imagedestroy($this->resource);
-		}
-		$this->resource = null;
-	}
+    /**
+     * Destroys the current image and resets the object
+     */
+    public function destroy() {
+        if ($this->valid()) {
+            imagedestroy($this->resource);
+        }
+        $this->resource = null;
+    }
 
-	public function __destruct() {
-		$this->destroy();
-	}
+    public function __destruct() {
+        $this->destroy();
+    }
 }
 
 if (!function_exists('imagebmp')) {
-	/**
-	 * Output a BMP image to either the browser or a file
-	 *
-	 * @link http://www.ugia.cn/wp-data/imagebmp.php
-	 * @author legend <legendsky@hotmail.com>
-	 * @link http://www.programmierer-forum.de/imagebmp-gute-funktion-gefunden-t143716.htm
-	 * @author mgutt <marc@gutt.it>
-	 * @version 1.00
-	 * @param resource $im
-	 * @param string $fileName [optional] <p>The path to save the file to.</p>
-	 * @param int $bit [optional] <p>Bit depth, (default is 24).</p>
-	 * @param int $compression [optional]
-	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
-	 */
-	function imagebmp($im, $fileName = '', $bit = 24, $compression = 0) {
-		if (!in_array($bit, array(1, 4, 8, 16, 24, 32))) {
-			$bit = 24;
-		} else if ($bit == 32) {
-			$bit = 24;
-		}
-		$bits = pow(2, $bit);
-		imagetruecolortopalette($im, true, $bits);
-		$width = imagesx($im);
-		$height = imagesy($im);
-		$colorsNum = imagecolorstotal($im);
-		$rgbQuad = '';
-		if ($bit <= 8) {
-			for ($i = 0; $i < $colorsNum; $i++) {
-				$colors = imagecolorsforindex($im, $i);
-				$rgbQuad .= chr($colors['blue']) . chr($colors['green']) . chr($colors['red']) . "\0";
-			}
-			$bmpData = '';
-			if ($compression == 0 || $bit < 8) {
-				$compression = 0;
-				$extra = '';
-				$padding = 4 - ceil($width / (8 / $bit)) % 4;
-				if ($padding % 4 != 0) {
-					$extra = str_repeat("\0", $padding);
-				}
-				for ($j = $height - 1; $j >= 0; $j--) {
-					$i = 0;
-					while ($i < $width) {
-						$bin = 0;
-						$limit = $width - $i < 8 / $bit ? (8 / $bit - $width + $i) * $bit : 0;
-						for ($k = 8 - $bit; $k >= $limit; $k -= $bit) {
-							$index = imagecolorat($im, $i, $j);
-							$bin |= $index << $k;
-							$i++;
-						}
-						$bmpData .= chr($bin);
-					}
-					$bmpData .= $extra;
-				}
-			} // RLE8
-			else if ($compression == 1 && $bit == 8) {
-				for ($j = $height - 1; $j >= 0; $j--) {
-					$lastIndex = "\0";
-					$sameNum = 0;
-					for ($i = 0; $i <= $width; $i++) {
-						$index = imagecolorat($im, $i, $j);
-						if ($index !== $lastIndex || $sameNum > 255) {
-							if ($sameNum != 0) {
-								$bmpData .= chr($sameNum) . chr($lastIndex);
-							}
-							$lastIndex = $index;
-							$sameNum = 1;
-						} else {
-							$sameNum++;
-						}
-					}
-					$bmpData .= "\0\0";
-				}
-				$bmpData .= "\0\1";
-			}
-			$sizeQuad = strlen($rgbQuad);
-			$sizeData = strlen($bmpData);
-		} else {
-			$extra = '';
-			$padding = 4 - ($width * ($bit / 8)) % 4;
-			if ($padding % 4 != 0) {
-				$extra = str_repeat("\0", $padding);
-			}
-			$bmpData = '';
-			for ($j = $height - 1; $j >= 0; $j--) {
-				for ($i = 0; $i < $width; $i++) {
-					$index = imagecolorat($im, $i, $j);
-					$colors = imagecolorsforindex($im, $index);
-					if ($bit == 16) {
-						$bin = 0 << $bit;
-						$bin |= ($colors['red'] >> 3) << 10;
-						$bin |= ($colors['green'] >> 3) << 5;
-						$bin |= $colors['blue'] >> 3;
-						$bmpData .= pack("v", $bin);
-					} else {
-						$bmpData .= pack("c*", $colors['blue'], $colors['green'], $colors['red']);
-					}
-				}
-				$bmpData .= $extra;
-			}
-			$sizeQuad = 0;
-			$sizeData = strlen($bmpData);
-			$colorsNum = 0;
-		}
-		$fileHeader = 'BM' . pack('V3', 54 + $sizeQuad + $sizeData, 0, 54 + $sizeQuad);
-		$infoHeader = pack('V3v2V*', 0x28, $width, $height, 1, $bit, $compression, $sizeData, 0, 0, $colorsNum, 0);
-		if ($fileName != '') {
-			$fp = fopen($fileName, 'wb');
-			fwrite($fp, $fileHeader . $infoHeader . $rgbQuad . $bmpData);
-			fclose($fp);
-			return true;
-		}
-		echo $fileHeader . $infoHeader . $rgbQuad . $bmpData;
-		return true;
-	}
+    /**
+     * Output a BMP image to either the browser or a file
+     *
+     * @link http://www.ugia.cn/wp-data/imagebmp.php
+     * @author legend <legendsky@hotmail.com>
+     * @link http://www.programmierer-forum.de/imagebmp-gute-funktion-gefunden-t143716.htm
+     * @author mgutt <marc@gutt.it>
+     * @version 1.00
+     * @param resource $im
+     * @param string $fileName [optional] <p>The path to save the file to.</p>
+     * @param int $bit [optional] <p>Bit depth, (default is 24).</p>
+     * @param int $compression [optional]
+     * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
+     */
+    function imagebmp($im, $fileName = '', $bit = 24, $compression = 0) {
+        if (!in_array($bit, array(1, 4, 8, 16, 24, 32))) {
+            $bit = 24;
+        } else if ($bit == 32) {
+            $bit = 24;
+        }
+        $bits = pow(2, $bit);
+        imagetruecolortopalette($im, true, $bits);
+        $width = imagesx($im);
+        $height = imagesy($im);
+        $colorsNum = imagecolorstotal($im);
+        $rgbQuad = '';
+        if ($bit <= 8) {
+            for ($i = 0; $i < $colorsNum; $i++) {
+                $colors = imagecolorsforindex($im, $i);
+                $rgbQuad .= chr($colors['blue']) . chr($colors['green']) . chr($colors['red']) . "\0";
+            }
+            $bmpData = '';
+            if ($compression == 0 || $bit < 8) {
+                $compression = 0;
+                $extra = '';
+                $padding = 4 - ceil($width / (8 / $bit)) % 4;
+                if ($padding % 4 != 0) {
+                    $extra = str_repeat("\0", $padding);
+                }
+                for ($j = $height - 1; $j >= 0; $j--) {
+                    $i = 0;
+                    while ($i < $width) {
+                        $bin = 0;
+                        $limit = $width - $i < 8 / $bit ? (8 / $bit - $width + $i) * $bit : 0;
+                        for ($k = 8 - $bit; $k >= $limit; $k -= $bit) {
+                            $index = imagecolorat($im, $i, $j);
+                            $bin |= $index << $k;
+                            $i++;
+                        }
+                        $bmpData .= chr($bin);
+                    }
+                    $bmpData .= $extra;
+                }
+            } // RLE8
+            else if ($compression == 1 && $bit == 8) {
+                for ($j = $height - 1; $j >= 0; $j--) {
+                    $lastIndex = "\0";
+                    $sameNum = 0;
+                    for ($i = 0; $i <= $width; $i++) {
+                        $index = imagecolorat($im, $i, $j);
+                        if ($index !== $lastIndex || $sameNum > 255) {
+                            if ($sameNum != 0) {
+                                $bmpData .= chr($sameNum) . chr($lastIndex);
+                            }
+                            $lastIndex = $index;
+                            $sameNum = 1;
+                        } else {
+                            $sameNum++;
+                        }
+                    }
+                    $bmpData .= "\0\0";
+                }
+                $bmpData .= "\0\1";
+            }
+            $sizeQuad = strlen($rgbQuad);
+            $sizeData = strlen($bmpData);
+        } else {
+            $extra = '';
+            $padding = 4 - ($width * ($bit / 8)) % 4;
+            if ($padding % 4 != 0) {
+                $extra = str_repeat("\0", $padding);
+            }
+            $bmpData = '';
+            for ($j = $height - 1; $j >= 0; $j--) {
+                for ($i = 0; $i < $width; $i++) {
+                    $index = imagecolorat($im, $i, $j);
+                    $colors = imagecolorsforindex($im, $index);
+                    if ($bit == 16) {
+                        $bin = 0 << $bit;
+                        $bin |= ($colors['red'] >> 3) << 10;
+                        $bin |= ($colors['green'] >> 3) << 5;
+                        $bin |= $colors['blue'] >> 3;
+                        $bmpData .= pack("v", $bin);
+                    } else {
+                        $bmpData .= pack("c*", $colors['blue'], $colors['green'], $colors['red']);
+                    }
+                }
+                $bmpData .= $extra;
+            }
+            $sizeQuad = 0;
+            $sizeData = strlen($bmpData);
+            $colorsNum = 0;
+        }
+        $fileHeader = 'BM' . pack('V3', 54 + $sizeQuad + $sizeData, 0, 54 + $sizeQuad);
+        $infoHeader = pack('V3v2V*', 0x28, $width, $height, 1, $bit, $compression, $sizeData, 0, 0, $colorsNum, 0);
+        if ($fileName != '') {
+            $fp = fopen($fileName, 'wb');
+            fwrite($fp, $fileHeader . $infoHeader . $rgbQuad . $bmpData);
+            fclose($fp);
+            return true;
+        }
+        echo $fileHeader . $infoHeader . $rgbQuad . $bmpData;
+        return true;
+    }
 }
 
 if (!function_exists('exif_imagetype')) {
-	/**
-	 * Workaround if exif_imagetype does not exist
-	 *
-	 * @link http://www.php.net/manual/en/function.exif-imagetype.php#80383
-	 * @param string $fileName
-	 * @return string|boolean
-	 */
-	function exif_imagetype($fileName) {
-		if (($info = getimagesize($fileName)) !== false) {
-			return $info[2];
-		}
-		return false;
-	}
+    /**
+     * Workaround if exif_imagetype does not exist
+     *
+     * @link http://www.php.net/manual/en/function.exif-imagetype.php#80383
+     * @param string $fileName
+     * @return string|boolean
+     */
+    function exif_imagetype($fileName) {
+        if (($info = getimagesize($fileName)) !== false) {
+            return $info[2];
+        }
+        return false;
+    }
 }

lib/private/Preview/TXT.php

Indentation +69 added lines, -69 removed lines

@@ -27,73 +27,73 @@
 namespace OC\Preview;
 
 class TXT extends Provider {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType() {
-		return '/text\/plain/';
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function isAvailable(\OCP\Files\FileInfo $file) {
-		return $file->getSize() > 0;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
-		$content = $fileview->fopen($path, 'r');
-
-		if ($content === false) {
-			return false;
-		}
-
-		$content = stream_get_contents($content,3000);
-
-		//don't create previews of empty text files
-		if(trim($content) === '') {
-			return false;
-		}
-
-		$lines = preg_split("/\r\n|\n|\r/", $content);
-
-		$fontSize = ($maxX) ? (int) ((5 / 32) * $maxX) : 5; //5px
-		$lineSize = ceil($fontSize * 1.25);
-
-		$image = imagecreate($maxX, $maxY);
-		imagecolorallocate($image, 255, 255, 255);
-		$textColor = imagecolorallocate($image, 0, 0, 0);
-
-		$fontFile  = __DIR__;
-		$fontFile .= '/../../../core';
-		$fontFile .= '/fonts/OpenSans-Regular.ttf';
-
-		$canUseTTF = function_exists('imagettftext');
-
-		foreach($lines as $index => $line) {
-			$index = $index + 1;
-
-			$x = (int) 1;
-			$y = (int) ($index * $lineSize);
-
-			if ($canUseTTF === true) {
-				imagettftext($image, $fontSize, 0, $x, $y, $textColor, $fontFile, $line);
-			} else {
-				$y -= $fontSize;
-				imagestring($image, 1, $x, $y, $line, $textColor);
-			}
-
-			if(($index * $lineSize) >= $maxY) {
-				break;
-			}
-		}
-
-		$imageObject = new \OC_Image();
-		$imageObject->setResource($image);
-
-		return $imageObject->valid() ? $imageObject : false;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType() {
+        return '/text\/plain/';
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isAvailable(\OCP\Files\FileInfo $file) {
+        return $file->getSize() > 0;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+        $content = $fileview->fopen($path, 'r');
+
+        if ($content === false) {
+            return false;
+        }
+
+        $content = stream_get_contents($content,3000);
+
+        //don't create previews of empty text files
+        if(trim($content) === '') {
+            return false;
+        }
+
+        $lines = preg_split("/\r\n|\n|\r/", $content);
+
+        $fontSize = ($maxX) ? (int) ((5 / 32) * $maxX) : 5; //5px
+        $lineSize = ceil($fontSize * 1.25);
+
+        $image = imagecreate($maxX, $maxY);
+        imagecolorallocate($image, 255, 255, 255);
+        $textColor = imagecolorallocate($image, 0, 0, 0);
+
+        $fontFile  = __DIR__;
+        $fontFile .= '/../../../core';
+        $fontFile .= '/fonts/OpenSans-Regular.ttf';
+
+        $canUseTTF = function_exists('imagettftext');
+
+        foreach($lines as $index => $line) {
+            $index = $index + 1;
+
+            $x = (int) 1;
+            $y = (int) ($index * $lineSize);
+
+            if ($canUseTTF === true) {
+                imagettftext($image, $fontSize, 0, $x, $y, $textColor, $fontFile, $line);
+            } else {
+                $y -= $fontSize;
+                imagestring($image, 1, $x, $y, $line, $textColor);
+            }
+
+            if(($index * $lineSize) >= $maxY) {
+                break;
+            }
+        }
+
+        $imageObject = new \OC_Image();
+        $imageObject->setResource($image);
+
+        return $imageObject->valid() ? $imageObject : false;
+    }
 }

lib/private/PreviewManager.php

Indentation +383 added lines, -383 removed lines

@@ -39,387 +39,387 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 class PreviewManager implements IPreview {
-	/** @var IConfig */
-	protected $config;
-
-	/** @var IRootFolder */
-	protected $rootFolder;
-
-	/** @var IAppData */
-	protected $appData;
-
-	/** @var EventDispatcherInterface */
-	protected $eventDispatcher;
-
-	/** @var Generator */
-	private $generator;
-
-	/** @var bool */
-	protected $providerListDirty = false;
-
-	/** @var bool */
-	protected $registeredCoreProviders = false;
-
-	/** @var array */
-	protected $providers = [];
-
-	/** @var array mime type => support status */
-	protected $mimeTypeSupportMap = [];
-
-	/** @var array */
-	protected $defaultProviders;
-
-	/** @var string */
-	protected $userId;
-
-	/**
-	 * PreviewManager constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IRootFolder $rootFolder
-	 * @param IAppData $appData
-	 * @param EventDispatcherInterface $eventDispatcher
-	 * @param string $userId
-	 */
-	public function __construct(IConfig $config,
-								IRootFolder $rootFolder,
-								IAppData $appData,
-								EventDispatcherInterface $eventDispatcher,
-								$userId) {
-		$this->config = $config;
-		$this->rootFolder = $rootFolder;
-		$this->appData = $appData;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->userId = $userId;
-	}
-
-	/**
-	 * In order to improve lazy loading a closure can be registered which will be
-	 * called in case preview providers are actually requested
-	 *
-	 * $callable has to return an instance of \OCP\Preview\IProvider
-	 *
-	 * @param string $mimeTypeRegex Regex with the mime types that are supported by this provider
-	 * @param \Closure $callable
-	 * @return void
-	 */
-	public function registerProvider($mimeTypeRegex, \Closure $callable) {
-		if (!$this->config->getSystemValue('enable_previews', true)) {
-			return;
-		}
-
-		if (!isset($this->providers[$mimeTypeRegex])) {
-			$this->providers[$mimeTypeRegex] = [];
-		}
-		$this->providers[$mimeTypeRegex][] = $callable;
-		$this->providerListDirty = true;
-	}
-
-	/**
-	 * Get all providers
-	 * @return array
-	 */
-	public function getProviders() {
-		if (!$this->config->getSystemValue('enable_previews', true)) {
-			return [];
-		}
-
-		$this->registerCoreProviders();
-		if ($this->providerListDirty) {
-			$keys = array_map('strlen', array_keys($this->providers));
-			array_multisort($keys, SORT_DESC, $this->providers);
-			$this->providerListDirty = false;
-		}
-
-		return $this->providers;
-	}
-
-	/**
-	 * Does the manager have any providers
-	 * @return bool
-	 */
-	public function hasProviders() {
-		$this->registerCoreProviders();
-		return !empty($this->providers);
-	}
-
-	/**
-	 * return a preview of a file
-	 *
-	 * @param string $file The path to the file where you want a thumbnail from
-	 * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
-	 * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
-	 * @param boolean $scaleUp Scale smaller images up to the thumbnail size or not. Might look ugly
-	 * @return \OCP\IImage
-	 * @deprecated 11 Use getPreview
-	 */
-	public function createPreview($file, $maxX = 100, $maxY = 75, $scaleUp = false) {
-		try {
-			$userRoot = $this->rootFolder->getUserFolder($this->userId)->getParent();
-			$node = $userRoot->get($file);
-			if (!($file instanceof File)) {
-				throw new NotFoundException();
-			}
-
-			$preview = $this->getPreview($node, $maxX, $maxY);
-		} catch (\Exception $e) {
-			return new \OC_Image();
-		}
-
-		$previewImage = new \OC_Image();
-		$previewImage->loadFromData($preview->getContent());
-		return $previewImage;
-	}
-
-	/**
-	 * Returns a preview of a file
-	 *
-	 * The cache is searched first and if nothing usable was found then a preview is
-	 * generated by one of the providers
-	 *
-	 * @param File $file
-	 * @param int $width
-	 * @param int $height
-	 * @param bool $crop
-	 * @param string $mode
-	 * @param string $mimeType
-	 * @return ISimpleFile
-	 * @throws NotFoundException
-	 * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
-	 * @since 11.0.0 - \InvalidArgumentException was added in 12.0.0
-	 */
-	public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL, $mimeType = null) {
-		if ($this->generator === null) {
-			$this->generator = new Generator(
-				$this->config,
-				$this,
-				$this->appData,
-				new GeneratorHelper(
-					$this->rootFolder
-				),
-				$this->eventDispatcher
-			);
-		}
-
-		return $this->generator->getPreview($file, $width, $height, $crop, $mode, $mimeType);
-	}
-
-	/**
-	 * returns true if the passed mime type is supported
-	 *
-	 * @param string $mimeType
-	 * @return boolean
-	 */
-	public function isMimeSupported($mimeType = '*') {
-		if (!$this->config->getSystemValue('enable_previews', true)) {
-			return false;
-		}
-
-		if (isset($this->mimeTypeSupportMap[$mimeType])) {
-			return $this->mimeTypeSupportMap[$mimeType];
-		}
-
-		$this->registerCoreProviders();
-		$providerMimeTypes = array_keys($this->providers);
-		foreach ($providerMimeTypes as $supportedMimeType) {
-			if (preg_match($supportedMimeType, $mimeType)) {
-				$this->mimeTypeSupportMap[$mimeType] = true;
-				return true;
-			}
-		}
-		$this->mimeTypeSupportMap[$mimeType] = false;
-		return false;
-	}
-
-	/**
-	 * Check if a preview can be generated for a file
-	 *
-	 * @param \OCP\Files\FileInfo $file
-	 * @return bool
-	 */
-	public function isAvailable(\OCP\Files\FileInfo $file) {
-		if (!$this->config->getSystemValue('enable_previews', true)) {
-			return false;
-		}
-
-		$this->registerCoreProviders();
-		if (!$this->isMimeSupported($file->getMimetype())) {
-			return false;
-		}
-
-		$mount = $file->getMountPoint();
-		if ($mount and !$mount->getOption('previews', true)){
-			return false;
-		}
-
-		foreach ($this->providers as $supportedMimeType => $providers) {
-			if (preg_match($supportedMimeType, $file->getMimetype())) {
-				foreach ($providers as $closure) {
-					$provider = $closure();
-					if (!($provider instanceof IProvider)) {
-						continue;
-					}
-
-					/** @var $provider IProvider */
-					if ($provider->isAvailable($file)) {
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * List of enabled default providers
-	 *
-	 * The following providers are enabled by default:
-	 *  - OC\Preview\PNG
-	 *  - OC\Preview\JPEG
-	 *  - OC\Preview\GIF
-	 *  - OC\Preview\BMP
-	 *  - OC\Preview\XBitmap
-	 *  - OC\Preview\MarkDown
-	 *  - OC\Preview\MP3
-	 *  - OC\Preview\TXT
-	 *
-	 * The following providers are disabled by default due to performance or privacy concerns:
-	 *  - OC\Preview\Font
-	 *  - OC\Preview\Illustrator
-	 *  - OC\Preview\Movie
-	 *  - OC\Preview\MSOfficeDoc
-	 *  - OC\Preview\MSOffice2003
-	 *  - OC\Preview\MSOffice2007
-	 *  - OC\Preview\OpenDocument
-	 *  - OC\Preview\PDF
-	 *  - OC\Preview\Photoshop
-	 *  - OC\Preview\Postscript
-	 *  - OC\Preview\StarOffice
-	 *  - OC\Preview\SVG
-	 *  - OC\Preview\TIFF
-	 *
-	 * @return array
-	 */
-	protected function getEnabledDefaultProvider() {
-		if ($this->defaultProviders !== null) {
-			return $this->defaultProviders;
-		}
-
-		$imageProviders = [
-			'OC\Preview\PNG',
-			'OC\Preview\JPEG',
-			'OC\Preview\GIF',
-			'OC\Preview\BMP',
-			'OC\Preview\XBitmap'
-		];
-
-		$this->defaultProviders = $this->config->getSystemValue('enabledPreviewProviders', array_merge([
-			'OC\Preview\MarkDown',
-			'OC\Preview\MP3',
-			'OC\Preview\TXT',
-		], $imageProviders));
-
-		if (in_array('OC\Preview\Image', $this->defaultProviders)) {
-			$this->defaultProviders = array_merge($this->defaultProviders, $imageProviders);
-		}
-		$this->defaultProviders = array_unique($this->defaultProviders);
-		return $this->defaultProviders;
-	}
-
-	/**
-	 * Register the default providers (if enabled)
-	 *
-	 * @param string $class
-	 * @param string $mimeType
-	 */
-	protected function registerCoreProvider($class, $mimeType, $options = []) {
-		if (in_array(trim($class, '\\'), $this->getEnabledDefaultProvider())) {
-			$this->registerProvider($mimeType, function () use ($class, $options) {
-				return new $class($options);
-			});
-		}
-	}
-
-	/**
-	 * Register the default providers (if enabled)
-	 */
-	protected function registerCoreProviders() {
-		if ($this->registeredCoreProviders) {
-			return;
-		}
-		$this->registeredCoreProviders = true;
-
-		$this->registerCoreProvider('OC\Preview\TXT', '/text\/plain/');
-		$this->registerCoreProvider('OC\Preview\MarkDown', '/text\/(x-)?markdown/');
-		$this->registerCoreProvider('OC\Preview\PNG', '/image\/png/');
-		$this->registerCoreProvider('OC\Preview\JPEG', '/image\/jpeg/');
-		$this->registerCoreProvider('OC\Preview\GIF', '/image\/gif/');
-		$this->registerCoreProvider('OC\Preview\BMP', '/image\/bmp/');
-		$this->registerCoreProvider('OC\Preview\XBitmap', '/image\/x-xbitmap/');
-		$this->registerCoreProvider('OC\Preview\MP3', '/audio\/mpeg/');
-
-		// SVG, Office and Bitmap require imagick
-		if (extension_loaded('imagick')) {
-			$checkImagick = new \Imagick();
-
-			$imagickProviders = [
-				'SVG'	=> ['mimetype' => '/image\/svg\+xml/', 'class' => '\OC\Preview\SVG'],
-				'TIFF'	=> ['mimetype' => '/image\/tiff/', 'class' => '\OC\Preview\TIFF'],
-				'PDF'	=> ['mimetype' => '/application\/pdf/', 'class' => '\OC\Preview\PDF'],
-				'AI'	=> ['mimetype' => '/application\/illustrator/', 'class' => '\OC\Preview\Illustrator'],
-				'PSD'	=> ['mimetype' => '/application\/x-photoshop/', 'class' => '\OC\Preview\Photoshop'],
-				'EPS'	=> ['mimetype' => '/application\/postscript/', 'class' => '\OC\Preview\Postscript'],
-				'TTF'	=> ['mimetype' => '/application\/(?:font-sfnt|x-font$)/', 'class' => '\OC\Preview\Font'],
-			];
-
-			foreach ($imagickProviders as $queryFormat => $provider) {
-				$class = $provider['class'];
-				if (!in_array(trim($class, '\\'), $this->getEnabledDefaultProvider())) {
-					continue;
-				}
-
-				if (count($checkImagick->queryFormats($queryFormat)) === 1) {
-					$this->registerCoreProvider($class, $provider['mimetype']);
-				}
-			}
-
-			if (count($checkImagick->queryFormats('PDF')) === 1) {
-				if (\OC_Helper::is_function_enabled('shell_exec')) {
-					$officeFound = is_string($this->config->getSystemValue('preview_libreoffice_path', null));
-
-					if (!$officeFound) {
-						//let's see if there is libreoffice or openoffice on this machine
-						$whichLibreOffice = shell_exec('command -v libreoffice');
-						$officeFound = !empty($whichLibreOffice);
-						if (!$officeFound) {
-							$whichOpenOffice = shell_exec('command -v openoffice');
-							$officeFound = !empty($whichOpenOffice);
-						}
-					}
-
-					if ($officeFound) {
-						$this->registerCoreProvider('\OC\Preview\MSOfficeDoc', '/application\/msword/');
-						$this->registerCoreProvider('\OC\Preview\MSOffice2003', '/application\/vnd.ms-.*/');
-						$this->registerCoreProvider('\OC\Preview\MSOffice2007', '/application\/vnd.openxmlformats-officedocument.*/');
-						$this->registerCoreProvider('\OC\Preview\OpenDocument', '/application\/vnd.oasis.opendocument.*/');
-						$this->registerCoreProvider('\OC\Preview\StarOffice', '/application\/vnd.sun.xml.*/');
-					}
-				}
-			}
-		}
-
-		// Video requires avconv or ffmpeg
-		if (in_array('OC\Preview\Movie', $this->getEnabledDefaultProvider())) {
-			$avconvBinary = \OC_Helper::findBinaryPath('avconv');
-			$ffmpegBinary = ($avconvBinary) ? null : \OC_Helper::findBinaryPath('ffmpeg');
-
-			if ($avconvBinary || $ffmpegBinary) {
-				// FIXME // a bit hacky but didn't want to use subclasses
-				\OC\Preview\Movie::$avconvBinary = $avconvBinary;
-				\OC\Preview\Movie::$ffmpegBinary = $ffmpegBinary;
-
-				$this->registerCoreProvider('\OC\Preview\Movie', '/video\/.*/');
-			}
-		}
-	}
+    /** @var IConfig */
+    protected $config;
+
+    /** @var IRootFolder */
+    protected $rootFolder;
+
+    /** @var IAppData */
+    protected $appData;
+
+    /** @var EventDispatcherInterface */
+    protected $eventDispatcher;
+
+    /** @var Generator */
+    private $generator;
+
+    /** @var bool */
+    protected $providerListDirty = false;
+
+    /** @var bool */
+    protected $registeredCoreProviders = false;
+
+    /** @var array */
+    protected $providers = [];
+
+    /** @var array mime type => support status */
+    protected $mimeTypeSupportMap = [];
+
+    /** @var array */
+    protected $defaultProviders;
+
+    /** @var string */
+    protected $userId;
+
+    /**
+     * PreviewManager constructor.
+     *
+     * @param IConfig $config
+     * @param IRootFolder $rootFolder
+     * @param IAppData $appData
+     * @param EventDispatcherInterface $eventDispatcher
+     * @param string $userId
+     */
+    public function __construct(IConfig $config,
+                                IRootFolder $rootFolder,
+                                IAppData $appData,
+                                EventDispatcherInterface $eventDispatcher,
+                                $userId) {
+        $this->config = $config;
+        $this->rootFolder = $rootFolder;
+        $this->appData = $appData;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->userId = $userId;
+    }
+
+    /**
+     * In order to improve lazy loading a closure can be registered which will be
+     * called in case preview providers are actually requested
+     *
+     * $callable has to return an instance of \OCP\Preview\IProvider
+     *
+     * @param string $mimeTypeRegex Regex with the mime types that are supported by this provider
+     * @param \Closure $callable
+     * @return void
+     */
+    public function registerProvider($mimeTypeRegex, \Closure $callable) {
+        if (!$this->config->getSystemValue('enable_previews', true)) {
+            return;
+        }
+
+        if (!isset($this->providers[$mimeTypeRegex])) {
+            $this->providers[$mimeTypeRegex] = [];
+        }
+        $this->providers[$mimeTypeRegex][] = $callable;
+        $this->providerListDirty = true;
+    }
+
+    /**
+     * Get all providers
+     * @return array
+     */
+    public function getProviders() {
+        if (!$this->config->getSystemValue('enable_previews', true)) {
+            return [];
+        }
+
+        $this->registerCoreProviders();
+        if ($this->providerListDirty) {
+            $keys = array_map('strlen', array_keys($this->providers));
+            array_multisort($keys, SORT_DESC, $this->providers);
+            $this->providerListDirty = false;
+        }
+
+        return $this->providers;
+    }
+
+    /**
+     * Does the manager have any providers
+     * @return bool
+     */
+    public function hasProviders() {
+        $this->registerCoreProviders();
+        return !empty($this->providers);
+    }
+
+    /**
+     * return a preview of a file
+     *
+     * @param string $file The path to the file where you want a thumbnail from
+     * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
+     * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
+     * @param boolean $scaleUp Scale smaller images up to the thumbnail size or not. Might look ugly
+     * @return \OCP\IImage
+     * @deprecated 11 Use getPreview
+     */
+    public function createPreview($file, $maxX = 100, $maxY = 75, $scaleUp = false) {
+        try {
+            $userRoot = $this->rootFolder->getUserFolder($this->userId)->getParent();
+            $node = $userRoot->get($file);
+            if (!($file instanceof File)) {
+                throw new NotFoundException();
+            }
+
+            $preview = $this->getPreview($node, $maxX, $maxY);
+        } catch (\Exception $e) {
+            return new \OC_Image();
+        }
+
+        $previewImage = new \OC_Image();
+        $previewImage->loadFromData($preview->getContent());
+        return $previewImage;
+    }
+
+    /**
+     * Returns a preview of a file
+     *
+     * The cache is searched first and if nothing usable was found then a preview is
+     * generated by one of the providers
+     *
+     * @param File $file
+     * @param int $width
+     * @param int $height
+     * @param bool $crop
+     * @param string $mode
+     * @param string $mimeType
+     * @return ISimpleFile
+     * @throws NotFoundException
+     * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
+     * @since 11.0.0 - \InvalidArgumentException was added in 12.0.0
+     */
+    public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL, $mimeType = null) {
+        if ($this->generator === null) {
+            $this->generator = new Generator(
+                $this->config,
+                $this,
+                $this->appData,
+                new GeneratorHelper(
+                    $this->rootFolder
+                ),
+                $this->eventDispatcher
+            );
+        }
+
+        return $this->generator->getPreview($file, $width, $height, $crop, $mode, $mimeType);
+    }
+
+    /**
+     * returns true if the passed mime type is supported
+     *
+     * @param string $mimeType
+     * @return boolean
+     */
+    public function isMimeSupported($mimeType = '*') {
+        if (!$this->config->getSystemValue('enable_previews', true)) {
+            return false;
+        }
+
+        if (isset($this->mimeTypeSupportMap[$mimeType])) {
+            return $this->mimeTypeSupportMap[$mimeType];
+        }
+
+        $this->registerCoreProviders();
+        $providerMimeTypes = array_keys($this->providers);
+        foreach ($providerMimeTypes as $supportedMimeType) {
+            if (preg_match($supportedMimeType, $mimeType)) {
+                $this->mimeTypeSupportMap[$mimeType] = true;
+                return true;
+            }
+        }
+        $this->mimeTypeSupportMap[$mimeType] = false;
+        return false;
+    }
+
+    /**
+     * Check if a preview can be generated for a file
+     *
+     * @param \OCP\Files\FileInfo $file
+     * @return bool
+     */
+    public function isAvailable(\OCP\Files\FileInfo $file) {
+        if (!$this->config->getSystemValue('enable_previews', true)) {
+            return false;
+        }
+
+        $this->registerCoreProviders();
+        if (!$this->isMimeSupported($file->getMimetype())) {
+            return false;
+        }
+
+        $mount = $file->getMountPoint();
+        if ($mount and !$mount->getOption('previews', true)){
+            return false;
+        }
+
+        foreach ($this->providers as $supportedMimeType => $providers) {
+            if (preg_match($supportedMimeType, $file->getMimetype())) {
+                foreach ($providers as $closure) {
+                    $provider = $closure();
+                    if (!($provider instanceof IProvider)) {
+                        continue;
+                    }
+
+                    /** @var $provider IProvider */
+                    if ($provider->isAvailable($file)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * List of enabled default providers
+     *
+     * The following providers are enabled by default:
+     *  - OC\Preview\PNG
+     *  - OC\Preview\JPEG
+     *  - OC\Preview\GIF
+     *  - OC\Preview\BMP
+     *  - OC\Preview\XBitmap
+     *  - OC\Preview\MarkDown
+     *  - OC\Preview\MP3
+     *  - OC\Preview\TXT
+     *
+     * The following providers are disabled by default due to performance or privacy concerns:
+     *  - OC\Preview\Font
+     *  - OC\Preview\Illustrator
+     *  - OC\Preview\Movie
+     *  - OC\Preview\MSOfficeDoc
+     *  - OC\Preview\MSOffice2003
+     *  - OC\Preview\MSOffice2007
+     *  - OC\Preview\OpenDocument
+     *  - OC\Preview\PDF
+     *  - OC\Preview\Photoshop
+     *  - OC\Preview\Postscript
+     *  - OC\Preview\StarOffice
+     *  - OC\Preview\SVG
+     *  - OC\Preview\TIFF
+     *
+     * @return array
+     */
+    protected function getEnabledDefaultProvider() {
+        if ($this->defaultProviders !== null) {
+            return $this->defaultProviders;
+        }
+
+        $imageProviders = [
+            'OC\Preview\PNG',
+            'OC\Preview\JPEG',
+            'OC\Preview\GIF',
+            'OC\Preview\BMP',
+            'OC\Preview\XBitmap'
+        ];
+
+        $this->defaultProviders = $this->config->getSystemValue('enabledPreviewProviders', array_merge([
+            'OC\Preview\MarkDown',
+            'OC\Preview\MP3',
+            'OC\Preview\TXT',
+        ], $imageProviders));
+
+        if (in_array('OC\Preview\Image', $this->defaultProviders)) {
+            $this->defaultProviders = array_merge($this->defaultProviders, $imageProviders);
+        }
+        $this->defaultProviders = array_unique($this->defaultProviders);
+        return $this->defaultProviders;
+    }
+
+    /**
+     * Register the default providers (if enabled)
+     *
+     * @param string $class
+     * @param string $mimeType
+     */
+    protected function registerCoreProvider($class, $mimeType, $options = []) {
+        if (in_array(trim($class, '\\'), $this->getEnabledDefaultProvider())) {
+            $this->registerProvider($mimeType, function () use ($class, $options) {
+                return new $class($options);
+            });
+        }
+    }
+
+    /**
+     * Register the default providers (if enabled)
+     */
+    protected function registerCoreProviders() {
+        if ($this->registeredCoreProviders) {
+            return;
+        }
+        $this->registeredCoreProviders = true;
+
+        $this->registerCoreProvider('OC\Preview\TXT', '/text\/plain/');
+        $this->registerCoreProvider('OC\Preview\MarkDown', '/text\/(x-)?markdown/');
+        $this->registerCoreProvider('OC\Preview\PNG', '/image\/png/');
+        $this->registerCoreProvider('OC\Preview\JPEG', '/image\/jpeg/');
+        $this->registerCoreProvider('OC\Preview\GIF', '/image\/gif/');
+        $this->registerCoreProvider('OC\Preview\BMP', '/image\/bmp/');
+        $this->registerCoreProvider('OC\Preview\XBitmap', '/image\/x-xbitmap/');
+        $this->registerCoreProvider('OC\Preview\MP3', '/audio\/mpeg/');
+
+        // SVG, Office and Bitmap require imagick
+        if (extension_loaded('imagick')) {
+            $checkImagick = new \Imagick();
+
+            $imagickProviders = [
+                'SVG'	=> ['mimetype' => '/image\/svg\+xml/', 'class' => '\OC\Preview\SVG'],
+                'TIFF'	=> ['mimetype' => '/image\/tiff/', 'class' => '\OC\Preview\TIFF'],
+                'PDF'	=> ['mimetype' => '/application\/pdf/', 'class' => '\OC\Preview\PDF'],
+                'AI'	=> ['mimetype' => '/application\/illustrator/', 'class' => '\OC\Preview\Illustrator'],
+                'PSD'	=> ['mimetype' => '/application\/x-photoshop/', 'class' => '\OC\Preview\Photoshop'],
+                'EPS'	=> ['mimetype' => '/application\/postscript/', 'class' => '\OC\Preview\Postscript'],
+                'TTF'	=> ['mimetype' => '/application\/(?:font-sfnt|x-font$)/', 'class' => '\OC\Preview\Font'],
+            ];
+
+            foreach ($imagickProviders as $queryFormat => $provider) {
+                $class = $provider['class'];
+                if (!in_array(trim($class, '\\'), $this->getEnabledDefaultProvider())) {
+                    continue;
+                }
+
+                if (count($checkImagick->queryFormats($queryFormat)) === 1) {
+                    $this->registerCoreProvider($class, $provider['mimetype']);
+                }
+            }
+
+            if (count($checkImagick->queryFormats('PDF')) === 1) {
+                if (\OC_Helper::is_function_enabled('shell_exec')) {
+                    $officeFound = is_string($this->config->getSystemValue('preview_libreoffice_path', null));
+
+                    if (!$officeFound) {
+                        //let's see if there is libreoffice or openoffice on this machine
+                        $whichLibreOffice = shell_exec('command -v libreoffice');
+                        $officeFound = !empty($whichLibreOffice);
+                        if (!$officeFound) {
+                            $whichOpenOffice = shell_exec('command -v openoffice');
+                            $officeFound = !empty($whichOpenOffice);
+                        }
+                    }
+
+                    if ($officeFound) {
+                        $this->registerCoreProvider('\OC\Preview\MSOfficeDoc', '/application\/msword/');
+                        $this->registerCoreProvider('\OC\Preview\MSOffice2003', '/application\/vnd.ms-.*/');
+                        $this->registerCoreProvider('\OC\Preview\MSOffice2007', '/application\/vnd.openxmlformats-officedocument.*/');
+                        $this->registerCoreProvider('\OC\Preview\OpenDocument', '/application\/vnd.oasis.opendocument.*/');
+                        $this->registerCoreProvider('\OC\Preview\StarOffice', '/application\/vnd.sun.xml.*/');
+                    }
+                }
+            }
+        }
+
+        // Video requires avconv or ffmpeg
+        if (in_array('OC\Preview\Movie', $this->getEnabledDefaultProvider())) {
+            $avconvBinary = \OC_Helper::findBinaryPath('avconv');
+            $ffmpegBinary = ($avconvBinary) ? null : \OC_Helper::findBinaryPath('ffmpeg');
+
+            if ($avconvBinary || $ffmpegBinary) {
+                // FIXME // a bit hacky but didn't want to use subclasses
+                \OC\Preview\Movie::$avconvBinary = $avconvBinary;
+                \OC\Preview\Movie::$ffmpegBinary = $ffmpegBinary;
+
+                $this->registerCoreProvider('\OC\Preview\Movie', '/video\/.*/');
+            }
+        }
+    }
 }

lib/private/Avatar.php

Indentation +380 added lines, -380 removed lines

@@ -46,385 +46,385 @@
  */
 
 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();
-			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);
-				}
-			}
-		}
-		$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');
-			$this->config->setUserValue($this->user->getUID(), 'avatar', 'generated', 'false');
-			$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->config->setUserValue($this->user->getUID(), 'avatar', 'generated', 'true');
-		$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');
-			$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')) {
-				$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));
-	}
-
-	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();
-	}
+    /** @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();
+            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);
+                }
+            }
+        }
+        $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');
+            $this->config->setUserValue($this->user->getUID(), 'avatar', 'generated', 'false');
+            $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->config->setUserValue($this->user->getUID(), 'avatar', 'generated', 'true');
+        $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');
+            $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')) {
+                $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));
+    }
+
+    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();
+    }
 
 }

Spacing +28 added lines, -28 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,16 +111,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 {
@@ -170,11 +170,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();
@@ -200,9 +200,9 @@ 
 		}
 
 		if ($size === -1) {
-			$path = 'avatar.' . $ext;
+			$path = 'avatar.'.$ext;
 		} else {
-			$path = 'avatar.' . $size . '.' . $ext;
+			$path = 'avatar.'.$size.'.'.$ext;
 		}
 
 		try {
@@ -218,7 +218,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();
@@ -228,7 +228,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();
 			}
 
@@ -266,7 +266,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);
@@ -303,12 +303,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;
@@ -345,14 +345,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
@@ -378,36 +378,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 +289 added lines, -289 removed lines

@@ -50,294 +50,294 @@
  */
 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();
-		$image->loadFromData($tmpAvatar);
-
-		$resp = new DataDisplayResponse($image->data(),
-				Http::STATUS_OK,
-				['Content-Type' => $image->mimeType()]);
-
-		$resp->setETag((string)crc32($image->data()));
-		$resp->cacheFor(0);
-		$resp->setLastModified(new \DateTime('now', new \DateTimeZone('GMT')));
-		return $resp;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param array $crop
-	 * @return JSONResponse
-	 */
-	public function postCroppedAvatar($crop) {
-		if (is_null($crop)) {
-			return new JSONResponse(['data' => ['message' => $this->l->t("No crop data provided")]],
-									Http::STATUS_BAD_REQUEST);
-		}
-
-		if (!isset($crop['x'], $crop['y'], $crop['w'], $crop['h'])) {
-			return new JSONResponse(['data' => ['message' => $this->l->t("No valid crop data provided")]],
-									Http::STATUS_BAD_REQUEST);
-		}
-
-		$tmpAvatar = $this->cache->get('tmpAvatar');
-		if (is_null($tmpAvatar)) {
-			return new JSONResponse(['data' => [
-										'message' => $this->l->t("No temporary profile picture available, try again")
-									]],
-									Http::STATUS_BAD_REQUEST);
-		}
-
-		$image = new \OC_Image();
-		$image->loadFromData($tmpAvatar);
-		$image->crop($crop['x'], $crop['y'], (int)round($crop['w']), (int)round($crop['h']));
-		try {
-			$avatar = $this->avatarManager->getAvatar($this->userId);
-			$avatar->set($image);
-			// Clean up
-			$this->cache->remove('tmpAvatar');
-			return new JSONResponse(['status' => 'success']);
-		} catch (\OC\NotSquareException $e) {
-			return new JSONResponse(['data' => ['message' => $this->l->t('Crop is not square')]],
-									Http::STATUS_BAD_REQUEST);
-		} catch (\Exception $e) {
-			$this->logger->logException($e, ['app' => 'core']);
-			return new JSONResponse(['data' => ['message' => $this->l->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST);
-		}
-	}
+     * @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();
+        $image->loadFromData($tmpAvatar);
+
+        $resp = new DataDisplayResponse($image->data(),
+                Http::STATUS_OK,
+                ['Content-Type' => $image->mimeType()]);
+
+        $resp->setETag((string)crc32($image->data()));
+        $resp->cacheFor(0);
+        $resp->setLastModified(new \DateTime('now', new \DateTimeZone('GMT')));
+        return $resp;
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @param array $crop
+     * @return JSONResponse
+     */
+    public function postCroppedAvatar($crop) {
+        if (is_null($crop)) {
+            return new JSONResponse(['data' => ['message' => $this->l->t("No crop data provided")]],
+                                    Http::STATUS_BAD_REQUEST);
+        }
+
+        if (!isset($crop['x'], $crop['y'], $crop['w'], $crop['h'])) {
+            return new JSONResponse(['data' => ['message' => $this->l->t("No valid crop data provided")]],
+                                    Http::STATUS_BAD_REQUEST);
+        }
+
+        $tmpAvatar = $this->cache->get('tmpAvatar');
+        if (is_null($tmpAvatar)) {
+            return new JSONResponse(['data' => [
+                                        'message' => $this->l->t("No temporary profile picture available, try again")
+                                    ]],
+                                    Http::STATUS_BAD_REQUEST);
+        }
+
+        $image = new \OC_Image();
+        $image->loadFromData($tmpAvatar);
+        $image->crop($crop['x'], $crop['y'], (int)round($crop['w']), (int)round($crop['h']));
+        try {
+            $avatar = $this->avatarManager->getAvatar($this->userId);
+            $avatar->set($image);
+            // Clean up
+            $this->cache->remove('tmpAvatar');
+            return new JSONResponse(['status' => 'success']);
+        } catch (\OC\NotSquareException $e) {
+            return new JSONResponse(['data' => ['message' => $this->l->t('Crop is not square')]],
+                                    Http::STATUS_BAD_REQUEST);
+        } catch (\Exception $e) {
+            $this->logger->logException($e, ['app' => 'core']);
+            return new JSONResponse(['data' => ['message' => $this->l->t('An error occurred. Please contact your admin.')]], Http::STATUS_BAD_REQUEST);
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -172,7 +172,7 @@ 
 			if (!($node instanceof File)) {
 				return new JSONResponse(['data' => ['message' => $this->l->t('Please select a file.')]]);
 			}
-			if ($node->getSize() > 20*1024*1024) {
+			if ($node->getSize() > 20 * 1024 * 1024) {
 				return new JSONResponse(
 					['data' => ['message' => $this->l->t('File is too big')]],
 					Http::STATUS_BAD_REQUEST
@@ -200,7 +200,7 @@ 
 				 is_uploaded_file($files['tmp_name'][0]) &&
 				!\OC\Files\Filesystem::isFileBlacklisted($files['tmp_name'][0])
 			) {
-				if ($files['size'][0] > 20*1024*1024) {
+				if ($files['size'][0] > 20 * 1024 * 1024) {
 					return new JSONResponse(
 						['data' => ['message' => $this->l->t('File is too big')]],
 						Http::STATUS_BAD_REQUEST
@@ -292,7 +292,7 @@ 
 				Http::STATUS_OK,
 				['Content-Type' => $image->mimeType()]);
 
-		$resp->setETag((string)crc32($image->data()));
+		$resp->setETag((string) crc32($image->data()));
 		$resp->cacheFor(0);
 		$resp->setLastModified(new \DateTime('now', new \DateTimeZone('GMT')));
 		return $resp;
@@ -325,7 +325,7 @@ 
 
 		$image = new \OC_Image();
 		$image->loadFromData($tmpAvatar);
-		$image->crop($crop['x'], $crop['y'], (int)round($crop['w']), (int)round($crop['h']));
+		$image->crop($crop['x'], $crop['y'], (int) round($crop['w']), (int) round($crop['h']));
 		try {
 			$avatar = $this->avatarManager->getAvatar($this->userId);
 			$avatar->set($image);