nextcloud / server

lib/private/legacy/image.php

Indentation +1072 added lines, -1072 removed lines

@@ -40,565 +40,565 @@ 
  * 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;
 
-	/**
-	 * Get mime type for an image file.
-	 *
-	 * @param string|null $filePath The path to a local image file.
-	 * @return string The mime type if the it could be determined, otherwise an empty string.
-	 */
-	static public function getMimeTypeForFile($filePath) {
-		// exif_imagetype throws "read error!" if file is less than 12 byte
-		if ($filePath !== null && filesize($filePath) > 11) {
-			$imageType = exif_imagetype($filePath);
-		} else {
-			$imageType = false;
-		}
-		return $imageType ? image_type_to_mime_type($imageType) : '';
-	}
+    /**
+     * Get mime type for an image file.
+     *
+     * @param string|null $filePath The path to a local image file.
+     * @return string The mime type if the it could be determined, otherwise an empty string.
+     */
+    static public function getMimeTypeForFile($filePath) {
+        // exif_imagetype throws "read error!" if file is less than 12 byte
+        if ($filePath !== null && filesize($filePath) > 11) {
+            $imageType = exif_imagetype($filePath);
+        } else {
+            $imageType = false;
+        }
+        return $imageType ? image_type_to_mime_type($imageType) : '';
+    }
 
-	/**
-	 * 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
-	 */
-	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
+     */
+    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) {
-			$this->load($imageRef);
-		}
-	}
+        if ($imageRef !== null) {
+            $this->load($imageRef);
+        }
+    }
 
-	/**
-	 * 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();
+    }
 
-	/**
-	 * @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 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 a local file, a base64 encoded string or a resource created by an imagecreate* function.
-	 *
-	 * @param resource|string $imageRef The path to a local file, a base64 encoded string or a resource created by an imagecreate* function or a file resource (file handle    ).
-	 * @return resource|false An image resource or false on error
-	 */
-	public function load($imageRef) {
-		if (is_resource($imageRef)) {
-			if (get_resource_type($imageRef) === 'gd') {
-				$this->resource = $imageRef;
-				return $this->resource;
-			} elseif (in_array(get_resource_type($imageRef), array('file', 'stream'))) {
-				return $this->loadFromFileHandle($imageRef);
-			}
-		} elseif ($this->loadFromBase64($imageRef) !== false) {
-			return $this->resource;
-		} elseif ($this->loadFromFile($imageRef) !== false) {
-			return $this->resource;
-		} elseif ($this->loadFromData($imageRef) !== false) {
-			return $this->resource;
-		}
-		$this->logger->debug(__METHOD__ . '(): could not load anything. Giving up!', array('app' => 'core'));
-		return false;
-	}
+    /**
+     * Loads an image from a local file, a base64 encoded string or a resource created by an imagecreate* function.
+     *
+     * @param resource|string $imageRef The path to a local file, a base64 encoded string or a resource created by an imagecreate* function or a file resource (file handle    ).
+     * @return resource|false An image resource or false on error
+     */
+    public function load($imageRef) {
+        if (is_resource($imageRef)) {
+            if (get_resource_type($imageRef) === 'gd') {
+                $this->resource = $imageRef;
+                return $this->resource;
+            } elseif (in_array(get_resource_type($imageRef), array('file', 'stream'))) {
+                return $this->loadFromFileHandle($imageRef);
+            }
+        } elseif ($this->loadFromBase64($imageRef) !== false) {
+            return $this->resource;
+        } elseif ($this->loadFromFile($imageRef) !== false) {
+            return $this->resource;
+        } elseif ($this->loadFromData($imageRef) !== false) {
+            return $this->resource;
+        }
+        $this->logger->debug(__METHOD__ . '(): could not load anything. Giving up!', array('app' => 'core'));
+        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)
@@ -622,581 +622,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(round($newWidth), round($newHeight));
-		return true;
-	}
+        $this->preciseResize(round($newWidth), round($newHeight));
+        return true;
+    }
 
-	/**
-	 * @param int $width
-	 * @param int $height
-	 * @return bool
-	 */
-	public function preciseResize($width, $height) {
-		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($width, $height) {
+        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($x, $y, $w, $h) {
-		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($x, $y, $w, $h) {
+        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(round($newWidth), round($newHeight));
-		return true;
-	}
+        $this->preciseResize(round($newWidth), 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;
+    }
 }

Spacing +43 added lines, -43 removed lines

@@ -145,7 +145,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:
@@ -169,7 +169,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:
@@ -196,7 +196,7 @@ 
 		if ($mimeType === null) {
 			$mimeType = $this->mimeType();
 		}
-		header('Content-Type: ' . $mimeType);
+		header('Content-Type: '.$mimeType);
 		return $this->_output(null, $mimeType);
 	}
 
@@ -214,7 +214,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;
@@ -238,10 +238,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;
 			}
 		}
@@ -269,7 +269,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');
 			}
 		}
 
@@ -417,7 +417,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;
 		}
@@ -435,7 +435,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) {
@@ -470,7 +470,7 @@ 
 				$rotate = 90;
 				break;
 		}
-		if($flip && function_exists('imageflip')) {
+		if ($flip && function_exists('imageflip')) {
 			imageflip($this->resource, IMG_FLIP_HORIZONTAL);
 		}
 		if ($rotate) {
@@ -518,7 +518,7 @@ 
 		} elseif ($this->loadFromData($imageRef) !== false) {
 			return $this->resource;
 		}
-		$this->logger->debug(__METHOD__ . '(): could not load anything. Giving up!', array('app' => 'core'));
+		$this->logger->debug(__METHOD__.'(): could not load anything. Giving up!', array('app' => 'core'));
 		return false;
 	}
 
@@ -557,7 +557,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:
@@ -565,10 +565,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:
@@ -578,21 +578,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:
@@ -702,7 +702,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
@@ -710,7 +710,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
@@ -734,7 +734,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;
 				}
 			}
@@ -744,7 +744,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) {
@@ -757,7 +757,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;
 		}
@@ -766,7 +766,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;
@@ -778,7 +778,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))) {
@@ -790,16 +790,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;
@@ -830,7 +830,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]);
@@ -852,7 +852,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);
@@ -878,7 +878,7 @@ 
 	 */
 	public function preciseResize($width, $height) {
 		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);
@@ -886,7 +886,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;
 		}
@@ -900,7 +900,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;
 		}
@@ -958,7 +958,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;
 		}
@@ -978,12 +978,12 @@ 
 	 */
 	public function crop($x, $y, $w, $h) {
 		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;
 		}
@@ -997,7 +997,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;
 		}
@@ -1017,7 +1017,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);
@@ -1040,7 +1040,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);
@@ -1098,7 +1098,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) {
@@ -1131,7 +1131,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;
@@ -1172,15 +1172,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;
 	}
 }

lib/private/PreviewManager.php

Indentation +381 added lines, -381 removed lines

@@ -38,385 +38,385 @@
 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();
-		}
-
-		return new \OC_Image($preview->getContent());
-	}
-
-	/**
-	 * 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();
+        }
+
+        return new \OC_Image($preview->getContent());
+    }
+
+    /**
+     * 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/Preview/Generator.php

Indentation +320 added lines, -320 removed lines

@@ -38,338 +38,338 @@
 
 class Generator {
 
-	/** @var IPreview */
-	private $previewManager;
-	/** @var IConfig */
-	private $config;
-	/** @var IAppData */
-	private $appData;
-	/** @var GeneratorHelper */
-	private $helper;
-	/** @var EventDispatcherInterface */
-	private $eventDispatcher;
-
-	/**
-	 * @param IConfig $config
-	 * @param IPreview $previewManager
-	 * @param IAppData $appData
-	 * @param GeneratorHelper $helper
-	 * @param EventDispatcherInterface $eventDispatcher
-	 */
-	public function __construct(
-		IConfig $config,
-		IPreview $previewManager,
-		IAppData $appData,
-		GeneratorHelper $helper,
-		EventDispatcherInterface $eventDispatcher
-	) {
-		$this->config = $config;
-		$this->previewManager = $previewManager;
-		$this->appData = $appData;
-		$this->helper = $helper;
-		$this->eventDispatcher = $eventDispatcher;
-	}
-
-	/**
-	 * 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)
-	 */
-	public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL, $mimeType = null) {
-		$this->eventDispatcher->dispatch(
-			IPreview::EVENT,
-			new GenericEvent($file,[
-				'width' => $width,
-				'height' => $height,
-				'crop' => $crop,
-				'mode' => $mode
-			])
-		);
-
-		if ($mimeType === null) {
-			$mimeType = $file->getMimeType();
-		}
-		if (!$this->previewManager->isMimeSupported($mimeType)) {
-			throw new NotFoundException();
-		}
-
-		$previewFolder = $this->getPreviewFolder($file);
-
-		// Get the max preview and infer the max preview sizes from that
-		$maxPreview = $this->getMaxPreview($previewFolder, $file, $mimeType);
-		list($maxWidth, $maxHeight) = $this->getPreviewSize($maxPreview);
-
-		// Calculate the preview size
-		list($width, $height) = $this->calculateSize($width, $height, $crop, $mode, $maxWidth, $maxHeight);
-
-		// No need to generate a preview that is just the max preview
-		if ($width === $maxWidth && $height === $maxHeight) {
-			return $maxPreview;
-		}
-
-		// Try to get a cached preview. Else generate (and store) one
-		try {
-			$file = $this->getCachedPreview($previewFolder, $width, $height, $crop);
-		} catch (NotFoundException $e) {
-			$file = $this->generatePreview($previewFolder, $maxPreview, $width, $height, $crop, $maxWidth, $maxHeight);
-		}
-
-		return $file;
-	}
-
-	/**
-	 * @param ISimpleFolder $previewFolder
-	 * @param File $file
-	 * @param string $mimeType
-	 * @return ISimpleFile
-	 * @throws NotFoundException
-	 */
-	private function getMaxPreview(ISimpleFolder $previewFolder, File $file, $mimeType) {
-		$nodes = $previewFolder->getDirectoryListing();
-
-		foreach ($nodes as $node) {
-			if (strpos($node->getName(), 'max')) {
-				return $node;
-			}
-		}
-
-		$previewProviders = $this->previewManager->getProviders();
-		foreach ($previewProviders as $supportedMimeType => $providers) {
-			if (!preg_match($supportedMimeType, $mimeType)) {
-				continue;
-			}
-
-			foreach ($providers as $provider) {
-				$provider = $this->helper->getProvider($provider);
-				if (!($provider instanceof IProvider)) {
-					continue;
-				}
-
-				$maxWidth = (int)$this->config->getSystemValue('preview_max_x', 2048);
-				$maxHeight = (int)$this->config->getSystemValue('preview_max_y', 2048);
-
-				$preview = $this->helper->getThumbnail($provider, $file, $maxWidth, $maxHeight);
-
-				if (!($preview instanceof IImage)) {
-					continue;
-				}
-
-				$path = (string)$preview->width() . '-' . (string)$preview->height() . '-max.png';
-				try {
-					$file = $previewFolder->newFile($path);
-					$file->putContent($preview->data());
-				} catch (NotPermittedException $e) {
-					throw new NotFoundException();
-				}
-
-				return $file;
-			}
-		}
-
-		throw new NotFoundException();
-	}
-
-	/**
-	 * @param ISimpleFile $file
-	 * @return int[]
-	 */
-	private function getPreviewSize(ISimpleFile $file) {
-		$size = explode('-', $file->getName());
-		return [(int)$size[0], (int)$size[1]];
-	}
-
-	/**
-	 * @param int $width
-	 * @param int $height
-	 * @param bool $crop
-	 * @return string
-	 */
-	private function generatePath($width, $height, $crop) {
-		$path = (string)$width . '-' . (string)$height;
-		if ($crop) {
-			$path .= '-crop';
-		}
-		$path .= '.png';
-		return $path;
-	}
-
-
-
-	/**
-	 * @param int $width
-	 * @param int $height
-	 * @param bool $crop
-	 * @param string $mode
-	 * @param int $maxWidth
-	 * @param int $maxHeight
-	 * @return int[]
-	 */
-	private function calculateSize($width, $height, $crop, $mode, $maxWidth, $maxHeight) {
-
-		/*
+    /** @var IPreview */
+    private $previewManager;
+    /** @var IConfig */
+    private $config;
+    /** @var IAppData */
+    private $appData;
+    /** @var GeneratorHelper */
+    private $helper;
+    /** @var EventDispatcherInterface */
+    private $eventDispatcher;
+
+    /**
+     * @param IConfig $config
+     * @param IPreview $previewManager
+     * @param IAppData $appData
+     * @param GeneratorHelper $helper
+     * @param EventDispatcherInterface $eventDispatcher
+     */
+    public function __construct(
+        IConfig $config,
+        IPreview $previewManager,
+        IAppData $appData,
+        GeneratorHelper $helper,
+        EventDispatcherInterface $eventDispatcher
+    ) {
+        $this->config = $config;
+        $this->previewManager = $previewManager;
+        $this->appData = $appData;
+        $this->helper = $helper;
+        $this->eventDispatcher = $eventDispatcher;
+    }
+
+    /**
+     * 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)
+     */
+    public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL, $mimeType = null) {
+        $this->eventDispatcher->dispatch(
+            IPreview::EVENT,
+            new GenericEvent($file,[
+                'width' => $width,
+                'height' => $height,
+                'crop' => $crop,
+                'mode' => $mode
+            ])
+        );
+
+        if ($mimeType === null) {
+            $mimeType = $file->getMimeType();
+        }
+        if (!$this->previewManager->isMimeSupported($mimeType)) {
+            throw new NotFoundException();
+        }
+
+        $previewFolder = $this->getPreviewFolder($file);
+
+        // Get the max preview and infer the max preview sizes from that
+        $maxPreview = $this->getMaxPreview($previewFolder, $file, $mimeType);
+        list($maxWidth, $maxHeight) = $this->getPreviewSize($maxPreview);
+
+        // Calculate the preview size
+        list($width, $height) = $this->calculateSize($width, $height, $crop, $mode, $maxWidth, $maxHeight);
+
+        // No need to generate a preview that is just the max preview
+        if ($width === $maxWidth && $height === $maxHeight) {
+            return $maxPreview;
+        }
+
+        // Try to get a cached preview. Else generate (and store) one
+        try {
+            $file = $this->getCachedPreview($previewFolder, $width, $height, $crop);
+        } catch (NotFoundException $e) {
+            $file = $this->generatePreview($previewFolder, $maxPreview, $width, $height, $crop, $maxWidth, $maxHeight);
+        }
+
+        return $file;
+    }
+
+    /**
+     * @param ISimpleFolder $previewFolder
+     * @param File $file
+     * @param string $mimeType
+     * @return ISimpleFile
+     * @throws NotFoundException
+     */
+    private function getMaxPreview(ISimpleFolder $previewFolder, File $file, $mimeType) {
+        $nodes = $previewFolder->getDirectoryListing();
+
+        foreach ($nodes as $node) {
+            if (strpos($node->getName(), 'max')) {
+                return $node;
+            }
+        }
+
+        $previewProviders = $this->previewManager->getProviders();
+        foreach ($previewProviders as $supportedMimeType => $providers) {
+            if (!preg_match($supportedMimeType, $mimeType)) {
+                continue;
+            }
+
+            foreach ($providers as $provider) {
+                $provider = $this->helper->getProvider($provider);
+                if (!($provider instanceof IProvider)) {
+                    continue;
+                }
+
+                $maxWidth = (int)$this->config->getSystemValue('preview_max_x', 2048);
+                $maxHeight = (int)$this->config->getSystemValue('preview_max_y', 2048);
+
+                $preview = $this->helper->getThumbnail($provider, $file, $maxWidth, $maxHeight);
+
+                if (!($preview instanceof IImage)) {
+                    continue;
+                }
+
+                $path = (string)$preview->width() . '-' . (string)$preview->height() . '-max.png';
+                try {
+                    $file = $previewFolder->newFile($path);
+                    $file->putContent($preview->data());
+                } catch (NotPermittedException $e) {
+                    throw new NotFoundException();
+                }
+
+                return $file;
+            }
+        }
+
+        throw new NotFoundException();
+    }
+
+    /**
+     * @param ISimpleFile $file
+     * @return int[]
+     */
+    private function getPreviewSize(ISimpleFile $file) {
+        $size = explode('-', $file->getName());
+        return [(int)$size[0], (int)$size[1]];
+    }
+
+    /**
+     * @param int $width
+     * @param int $height
+     * @param bool $crop
+     * @return string
+     */
+    private function generatePath($width, $height, $crop) {
+        $path = (string)$width . '-' . (string)$height;
+        if ($crop) {
+            $path .= '-crop';
+        }
+        $path .= '.png';
+        return $path;
+    }
+
+
+
+    /**
+     * @param int $width
+     * @param int $height
+     * @param bool $crop
+     * @param string $mode
+     * @param int $maxWidth
+     * @param int $maxHeight
+     * @return int[]
+     */
+    private function calculateSize($width, $height, $crop, $mode, $maxWidth, $maxHeight) {
+
+        /*
 		 * If we are not cropping we have to make sure the requested image
 		 * respects the aspect ratio of the original.
 		 */
-		if (!$crop) {
-			$ratio = $maxHeight / $maxWidth;
+        if (!$crop) {
+            $ratio = $maxHeight / $maxWidth;
 
-			if ($width === -1) {
-				$width = $height / $ratio;
-			}
-			if ($height === -1) {
-				$height = $width * $ratio;
-			}
+            if ($width === -1) {
+                $width = $height / $ratio;
+            }
+            if ($height === -1) {
+                $height = $width * $ratio;
+            }
 
-			$ratioH = $height / $maxHeight;
-			$ratioW = $width / $maxWidth;
+            $ratioH = $height / $maxHeight;
+            $ratioW = $width / $maxWidth;
 
-			/*
+            /*
 			 * Fill means that the $height and $width are the max
 			 * Cover means min.
 			 */
-			if ($mode === IPreview::MODE_FILL) {
-				if ($ratioH > $ratioW) {
-					$height = $width * $ratio;
-				} else {
-					$width = $height / $ratio;
-				}
-			} else if ($mode === IPreview::MODE_COVER) {
-				if ($ratioH > $ratioW) {
-					$width = $height / $ratio;
-				} else {
-					$height = $width * $ratio;
-				}
-			}
-		}
-
-		if ($height !== $maxHeight && $width !== $maxWidth) {
-			/*
+            if ($mode === IPreview::MODE_FILL) {
+                if ($ratioH > $ratioW) {
+                    $height = $width * $ratio;
+                } else {
+                    $width = $height / $ratio;
+                }
+            } else if ($mode === IPreview::MODE_COVER) {
+                if ($ratioH > $ratioW) {
+                    $width = $height / $ratio;
+                } else {
+                    $height = $width * $ratio;
+                }
+            }
+        }
+
+        if ($height !== $maxHeight && $width !== $maxWidth) {
+            /*
 			 * Scale to the nearest power of two
 			 */
-			$pow2height = 2 ** ceil(log($height) / log(2));
-			$pow2width = 2 ** ceil(log($width) / log(2));
-
-			$ratioH = $height / $pow2height;
-			$ratioW = $width / $pow2width;
-
-			if ($ratioH < $ratioW) {
-				$width = $pow2width;
-				$height /= $ratioW;
-			} else {
-				$height = $pow2height;
-				$width /= $ratioH;
-			}
-		}
-
-		/*
+            $pow2height = 2 ** ceil(log($height) / log(2));
+            $pow2width = 2 ** ceil(log($width) / log(2));
+
+            $ratioH = $height / $pow2height;
+            $ratioW = $width / $pow2width;
+
+            if ($ratioH < $ratioW) {
+                $width = $pow2width;
+                $height /= $ratioW;
+            } else {
+                $height = $pow2height;
+                $width /= $ratioH;
+            }
+        }
+
+        /*
  		 * Make sure the requested height and width fall within the max
  		 * of the preview.
  		 */
-		if ($height > $maxHeight) {
-			$ratio = $height / $maxHeight;
-			$height = $maxHeight;
-			$width /= $ratio;
-		}
-		if ($width > $maxWidth) {
-			$ratio = $width / $maxWidth;
-			$width = $maxWidth;
-			$height /= $ratio;
-		}
-
-		return [(int)round($width), (int)round($height)];
-	}
-
-	/**
-	 * @param ISimpleFolder $previewFolder
-	 * @param ISimpleFile $maxPreview
-	 * @param int $width
-	 * @param int $height
-	 * @param bool $crop
-	 * @param int $maxWidth
-	 * @param int $maxHeight
-	 * @return ISimpleFile
-	 * @throws NotFoundException
-	 * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
-	 */
-	private function generatePreview(ISimpleFolder $previewFolder, ISimpleFile $maxPreview, $width, $height, $crop, $maxWidth, $maxHeight) {
-		$preview = $this->helper->getImage($maxPreview);
-
-		if ($crop) {
-			if ($height !== $preview->height() && $width !== $preview->width()) {
-				//Resize
-				$widthR = $preview->width() / $width;
-				$heightR = $preview->height() / $height;
-
-				if ($widthR > $heightR) {
-					$scaleH = $height;
-					$scaleW = $maxWidth / $heightR;
-				} else {
-					$scaleH = $maxHeight / $widthR;
-					$scaleW = $width;
-				}
-				$preview->preciseResize(round($scaleW), round($scaleH));
-			}
-			$cropX = floor(abs($width - $preview->width()) * 0.5);
-			$cropY = 0;
-			$preview->crop($cropX, $cropY, $width, $height);
-		} else {
-			$preview->resize(max($width, $height));
-		}
-
-		if (!$preview->valid()) {
-			throw new \InvalidArgumentException('Failed to generate preview');
-		}
-
-		$path = $this->generatePath($width, $height, $crop);
-		try {
-			$file = $previewFolder->newFile($path);
-			$file->putContent($preview->data());
-		} catch (NotPermittedException $e) {
-			throw new NotFoundException();
-		}
-
-		return $file;
-	}
-
-	/**
-	 * @param ISimpleFolder $previewFolder
-	 * @param int $width
-	 * @param int $height
-	 * @param bool $crop
-	 * @return ISimpleFile
-	 *
-	 * @throws NotFoundException
-	 */
-	private function getCachedPreview(ISimpleFolder $previewFolder, $width, $height, $crop) {
-		$path = $this->generatePath($width, $height, $crop);
-
-		return $previewFolder->getFile($path);
-	}
-
-	/**
-	 * Get the specific preview folder for this file
-	 *
-	 * @param File $file
-	 * @return ISimpleFolder
-	 */
-	private function getPreviewFolder(File $file) {
-		try {
-			$folder = $this->appData->getFolder($file->getId());
-		} catch (NotFoundException $e) {
-			$folder = $this->appData->newFolder($file->getId());
-		}
-
-		return $folder;
-	}
+        if ($height > $maxHeight) {
+            $ratio = $height / $maxHeight;
+            $height = $maxHeight;
+            $width /= $ratio;
+        }
+        if ($width > $maxWidth) {
+            $ratio = $width / $maxWidth;
+            $width = $maxWidth;
+            $height /= $ratio;
+        }
+
+        return [(int)round($width), (int)round($height)];
+    }
+
+    /**
+     * @param ISimpleFolder $previewFolder
+     * @param ISimpleFile $maxPreview
+     * @param int $width
+     * @param int $height
+     * @param bool $crop
+     * @param int $maxWidth
+     * @param int $maxHeight
+     * @return ISimpleFile
+     * @throws NotFoundException
+     * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
+     */
+    private function generatePreview(ISimpleFolder $previewFolder, ISimpleFile $maxPreview, $width, $height, $crop, $maxWidth, $maxHeight) {
+        $preview = $this->helper->getImage($maxPreview);
+
+        if ($crop) {
+            if ($height !== $preview->height() && $width !== $preview->width()) {
+                //Resize
+                $widthR = $preview->width() / $width;
+                $heightR = $preview->height() / $height;
+
+                if ($widthR > $heightR) {
+                    $scaleH = $height;
+                    $scaleW = $maxWidth / $heightR;
+                } else {
+                    $scaleH = $maxHeight / $widthR;
+                    $scaleW = $width;
+                }
+                $preview->preciseResize(round($scaleW), round($scaleH));
+            }
+            $cropX = floor(abs($width - $preview->width()) * 0.5);
+            $cropY = 0;
+            $preview->crop($cropX, $cropY, $width, $height);
+        } else {
+            $preview->resize(max($width, $height));
+        }
+
+        if (!$preview->valid()) {
+            throw new \InvalidArgumentException('Failed to generate preview');
+        }
+
+        $path = $this->generatePath($width, $height, $crop);
+        try {
+            $file = $previewFolder->newFile($path);
+            $file->putContent($preview->data());
+        } catch (NotPermittedException $e) {
+            throw new NotFoundException();
+        }
+
+        return $file;
+    }
+
+    /**
+     * @param ISimpleFolder $previewFolder
+     * @param int $width
+     * @param int $height
+     * @param bool $crop
+     * @return ISimpleFile
+     *
+     * @throws NotFoundException
+     */
+    private function getCachedPreview(ISimpleFolder $previewFolder, $width, $height, $crop) {
+        $path = $this->generatePath($width, $height, $crop);
+
+        return $previewFolder->getFile($path);
+    }
+
+    /**
+     * Get the specific preview folder for this file
+     *
+     * @param File $file
+     * @return ISimpleFolder
+     */
+    private function getPreviewFolder(File $file) {
+        try {
+            $folder = $this->appData->getFolder($file->getId());
+        } catch (NotFoundException $e) {
+            $folder = $this->appData->newFolder($file->getId());
+        }
+
+        return $folder;
+    }
 }

lib/public/IPreview.php

Indentation +74 added lines, -74 removed lines

@@ -43,86 +43,86 @@
  */
 interface IPreview {
 
-	/**
-	 * @since 9.2.0
-	 */
-	const EVENT = self::class . ':' . 'PreviewRequested';
+    /**
+     * @since 9.2.0
+     */
+    const EVENT = self::class . ':' . 'PreviewRequested';
 
-	const MODE_FILL = 'fill';
-	const MODE_COVER = 'cover';
+    const MODE_FILL = 'fill';
+    const MODE_COVER = 'cover';
 
-	/**
-	 * 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
-	 * @since 8.1.0
-	 */
-	public function registerProvider($mimeTypeRegex, \Closure $callable);
+    /**
+     * 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
+     * @since 8.1.0
+     */
+    public function registerProvider($mimeTypeRegex, \Closure $callable);
 
-	/**
-	 * Get all providers
-	 * @return array
-	 * @since 8.1.0
-	 */
-	public function getProviders();
+    /**
+     * Get all providers
+     * @return array
+     * @since 8.1.0
+     */
+    public function getProviders();
 
-	/**
-	 * Does the manager have any providers
-	 * @return bool
-	 * @since 8.1.0
-	 */
-	public function hasProviders();
+    /**
+     * Does the manager have any providers
+     * @return bool
+     * @since 8.1.0
+     */
+    public function hasProviders();
 
-	/**
-	 * 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
-	 * @since 6.0.0
-	 * @deprecated 11 Use getPreview
-	 */
-	public function createPreview($file, $maxX = 100, $maxY = 75, $scaleUp = false);
+    /**
+     * 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
+     * @since 6.0.0
+     * @deprecated 11 Use getPreview
+     */
+    public function createPreview($file, $maxX = 100, $maxY = 75, $scaleUp = false);
 
-	/**
-	 * 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 To force a given mimetype for the file (files_versions needs this)
-	 * @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);
+    /**
+     * 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 To force a given mimetype for the file (files_versions needs this)
+     * @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);
 
-	/**
-	 * Returns true if the passed mime type is supported
-	 * @param string $mimeType
-	 * @return boolean
-	 * @since 6.0.0
-	 */
-	public function isMimeSupported($mimeType = '*');
+    /**
+     * Returns true if the passed mime type is supported
+     * @param string $mimeType
+     * @return boolean
+     * @since 6.0.0
+     */
+    public function isMimeSupported($mimeType = '*');
 
-	/**
-	 * Check if a preview can be generated for a file
-	 *
-	 * @param \OCP\Files\FileInfo $file
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function isAvailable(\OCP\Files\FileInfo $file);
+    /**
+     * Check if a preview can be generated for a file
+     *
+     * @param \OCP\Files\FileInfo $file
+     * @return bool
+     * @since 8.0.0
+     */
+    public function isAvailable(\OCP\Files\FileInfo $file);
 }

core/Controller/PreviewController.php

Indentation +95 added lines, -95 removed lines

@@ -36,99 +36,99 @@
 
 class PreviewController extends Controller {
 
-	/** @var string */
-	private $userId;
-
-	/** @var IRootFolder */
-	private $root;
-
-	/** @var IPreview */
-	private $preview;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/**
-	 * PreviewController constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IPreview $preview
-	 * @param IRootFolder $root
-	 * @param string $userId
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IPreview $preview,
-								IRootFolder $root,
-								$userId,
-								ITimeFactory $timeFactory
-	) {
-		parent::__construct($appName, $request);
-
-		$this->preview = $preview;
-		$this->root = $root;
-		$this->userId = $userId;
-		$this->timeFactory = $timeFactory;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param string $file
-	 * @param int $x
-	 * @param int $y
-	 * @param bool $a
-	 * @param bool $forceIcon
-	 * @param string $mode
-	 * @return DataResponse|Http\FileDisplayResponse
-	 */
-	public function getPreview(
-		$file = '',
-		$x = 32,
-		$y = 32,
-		$a = false,
-		$forceIcon = true,
-		$mode = 'fill') {
-
-		if ($file === '' || $x === 0 || $y === 0) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		try {
-			$userFolder = $this->root->getUserFolder($this->userId);
-			$file = $userFolder->get($file);
-		} catch (NotFoundException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		if (!($file instanceof File) || (!$forceIcon && !$this->preview->isAvailable($file))) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		} else if (!$file->isReadable()) {
-			return new DataResponse([], Http::STATUS_FORBIDDEN);
-		}
-
-		try {
-			$f = $this->preview->getPreview($file, $x, $y, !$a, $mode);
-			$response = new FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
-
-			// Let cache this!
-			$response->addHeader('Pragma', 'public');
-
-			// Cache previews for 24H
-			$response->cacheFor(3600 * 24);
-			$expires = new \DateTime();
-			$expires->setTimestamp($this->timeFactory->getTime());
-			$expires->add(new \DateInterval('P1D'));
-			$response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
-
-			return $response;
-		} catch (NotFoundException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-	}
+    /** @var string */
+    private $userId;
+
+    /** @var IRootFolder */
+    private $root;
+
+    /** @var IPreview */
+    private $preview;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /**
+     * PreviewController constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IPreview $preview
+     * @param IRootFolder $root
+     * @param string $userId
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IPreview $preview,
+                                IRootFolder $root,
+                                $userId,
+                                ITimeFactory $timeFactory
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->preview = $preview;
+        $this->root = $root;
+        $this->userId = $userId;
+        $this->timeFactory = $timeFactory;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param string $file
+     * @param int $x
+     * @param int $y
+     * @param bool $a
+     * @param bool $forceIcon
+     * @param string $mode
+     * @return DataResponse|Http\FileDisplayResponse
+     */
+    public function getPreview(
+        $file = '',
+        $x = 32,
+        $y = 32,
+        $a = false,
+        $forceIcon = true,
+        $mode = 'fill') {
+
+        if ($file === '' || $x === 0 || $y === 0) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        try {
+            $userFolder = $this->root->getUserFolder($this->userId);
+            $file = $userFolder->get($file);
+        } catch (NotFoundException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        if (!($file instanceof File) || (!$forceIcon && !$this->preview->isAvailable($file))) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        } else if (!$file->isReadable()) {
+            return new DataResponse([], Http::STATUS_FORBIDDEN);
+        }
+
+        try {
+            $f = $this->preview->getPreview($file, $x, $y, !$a, $mode);
+            $response = new FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
+
+            // Let cache this!
+            $response->addHeader('Pragma', 'public');
+
+            // Cache previews for 24H
+            $response->cacheFor(3600 * 24);
+            $expires = new \DateTime();
+            $expires->setTimestamp($this->timeFactory->getTime());
+            $expires->add(new \DateInterval('P1D'));
+            $response->addHeader('Expires', $expires->format(\DateTime::RFC2822));
+
+            return $response;
+        } catch (NotFoundException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+    }
 }

apps/files_sharing/lib/Controller/PublicPreviewController.php

Indentation +56 added lines, -56 removed lines

@@ -36,69 +36,69 @@
 
 class PublicPreviewController extends Controller {
 
-	/** @var ShareManager */
-	private $shareManager;
+    /** @var ShareManager */
+    private $shareManager;
 
-	/** @var IPreview */
-	private $previewManager;
+    /** @var IPreview */
+    private $previewManager;
 
-	public function __construct($appName,
-								IRequest $request,
-								ShareManager $shareManger,
-								IPreview $previewManager) {
-		parent::__construct($appName, $request);
+    public function __construct($appName,
+                                IRequest $request,
+                                ShareManager $shareManger,
+                                IPreview $previewManager) {
+        parent::__construct($appName, $request);
 
-		$this->shareManager = $shareManger;
-		$this->previewManager = $previewManager;
-	}
+        $this->shareManager = $shareManger;
+        $this->previewManager = $previewManager;
+    }
 
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param string $file
-	 * @param int $x
-	 * @param int $y
-	 * @param string $t
-	 * @param bool $a
-	 * @return DataResponse|FileDisplayResponse
-	 */
-	public function getPreview(
-		$file = '',
-		$x = 32,
-		$y = 32,
-		$t = '',
-		$a = false
-	) {
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param string $file
+     * @param int $x
+     * @param int $y
+     * @param string $t
+     * @param bool $a
+     * @return DataResponse|FileDisplayResponse
+     */
+    public function getPreview(
+        $file = '',
+        $x = 32,
+        $y = 32,
+        $t = '',
+        $a = false
+    ) {
 
-		if ($t === '' || $x === 0 || $y === 0) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
+        if ($t === '' || $x === 0 || $y === 0) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
 
-		try {
-			$share = $this->shareManager->getShareByToken($t);
-		} catch (ShareNotFound $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
+        try {
+            $share = $this->shareManager->getShareByToken($t);
+        } catch (ShareNotFound $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
 
-		if (($share->getPermissions() & Constants::PERMISSION_READ) === 0) {
-			return new DataResponse([], Http::STATUS_FORBIDDEN);
-		}
+        if (($share->getPermissions() & Constants::PERMISSION_READ) === 0) {
+            return new DataResponse([], Http::STATUS_FORBIDDEN);
+        }
 
-		try {
-			$node = $share->getNode();
-			if ($node instanceof Folder) {
-				$file = $node->get($file);
-			} else {
-				$file = $node;
-			}
+        try {
+            $node = $share->getNode();
+            if ($node instanceof Folder) {
+                $file = $node->get($file);
+            } else {
+                $file = $node;
+            }
 
-			$f = $this->previewManager->getPreview($file, $x, $y, !$a);
-			return new FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
-		} catch (NotFoundException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-	}
+            $f = $this->previewManager->getPreview($file, $x, $y, !$a);
+            return new FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
+        } catch (NotFoundException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+    }
 }

apps/files_trashbin/lib/Controller/PreviewController.php

Indentation +71 added lines, -71 removed lines

@@ -35,87 +35,87 @@
 
 class PreviewController extends Controller {
 
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	/** @var string */
-	private $userId;
+    /** @var string */
+    private $userId;
 
-	/** @var IMimeTypeDetector */
-	private $mimeTypeDetector;
+    /** @var IMimeTypeDetector */
+    private $mimeTypeDetector;
 
-	/** @var IPreview */
-	private $previewManager;
+    /** @var IPreview */
+    private $previewManager;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IRootFolder $rootFolder
-	 * @param $userId
-	 * @param IMimeTypeDetector $mimeTypeDetector
-	 * @param IPreview $previewManager
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IRootFolder $rootFolder,
-								$userId,
-								IMimeTypeDetector $mimeTypeDetector,
-								IPreview $previewManager) {
-		parent::__construct($appName, $request);
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IRootFolder $rootFolder
+     * @param $userId
+     * @param IMimeTypeDetector $mimeTypeDetector
+     * @param IPreview $previewManager
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IRootFolder $rootFolder,
+                                $userId,
+                                IMimeTypeDetector $mimeTypeDetector,
+                                IPreview $previewManager) {
+        parent::__construct($appName, $request);
 
-		$this->rootFolder = $rootFolder;
-		$this->userId = $userId;
-		$this->mimeTypeDetector = $mimeTypeDetector;
-		$this->previewManager = $previewManager;
-	}
+        $this->rootFolder = $rootFolder;
+        $this->userId = $userId;
+        $this->mimeTypeDetector = $mimeTypeDetector;
+        $this->previewManager = $previewManager;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param string $file
-	 * @param int $x
-	 * @param int $y
-	 * @return DataResponse|Http\FileDisplayResponse
-	 */
-	public function getPreview(
-		$file = '',
-		$x = 44,
-		$y = 44
-	) {
-		if ($file === '') {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param string $file
+     * @param int $x
+     * @param int $y
+     * @return DataResponse|Http\FileDisplayResponse
+     */
+    public function getPreview(
+        $file = '',
+        $x = 44,
+        $y = 44
+    ) {
+        if ($file === '') {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
 
-		if ($x === 0 || $y === 0) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
+        if ($x === 0 || $y === 0) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
 
-		try {
-			$userFolder = $this->rootFolder->getUserFolder($this->userId);
-			/** @var Folder $trash */
-			$trash = $userFolder->getParent()->get('files_trashbin/files');
-			$trashFile = $trash->get($file);
+        try {
+            $userFolder = $this->rootFolder->getUserFolder($this->userId);
+            /** @var Folder $trash */
+            $trash = $userFolder->getParent()->get('files_trashbin/files');
+            $trashFile = $trash->get($file);
 
-			if ($trashFile instanceof Folder) {
-				return new DataResponse([], Http::STATUS_BAD_REQUEST);
-			}
+            if ($trashFile instanceof Folder) {
+                return new DataResponse([], Http::STATUS_BAD_REQUEST);
+            }
 
-			/** @var File $trashFile */
-			$fileName = $trashFile->getName();
-			$i = strrpos($fileName, '.');
-			if ($i !== false) {
-				$fileName = substr($fileName, 0, $i);
-			}
+            /** @var File $trashFile */
+            $fileName = $trashFile->getName();
+            $i = strrpos($fileName, '.');
+            if ($i !== false) {
+                $fileName = substr($fileName, 0, $i);
+            }
 
-			$mimeType = $this->mimeTypeDetector->detectPath($fileName);
+            $mimeType = $this->mimeTypeDetector->detectPath($fileName);
 
-			$f = $this->previewManager->getPreview($trashFile, $x, $y, true, IPreview::MODE_FILL, $mimeType);
-			return new Http\FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
-		} catch (NotFoundException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-	}
+            $f = $this->previewManager->getPreview($trashFile, $x, $y, true, IPreview::MODE_FILL, $mimeType);
+            return new Http\FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
+        } catch (NotFoundException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+    }
 }

apps/files_versions/lib/Controller/PreviewController.php

Indentation +54 added lines, -54 removed lines

@@ -36,66 +36,66 @@
 
 class PreviewController extends Controller {
 
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	/** @var string */
-	private $userId;
+    /** @var string */
+    private $userId;
 
-	/** @var IMimeTypeDetector */
-	private $mimeTypeDetector;
+    /** @var IMimeTypeDetector */
+    private $mimeTypeDetector;
 
-	/** @var IPreview */
-	private $previewManager;
+    /** @var IPreview */
+    private $previewManager;
 
-	public function __construct($appName,
-								IRequest $request,
-								IRootFolder $rootFolder,
-								$userId,
-								IMimeTypeDetector $mimeTypeDetector,
-								IPreview $previewManager) {
-		parent::__construct($appName, $request);
+    public function __construct($appName,
+                                IRequest $request,
+                                IRootFolder $rootFolder,
+                                $userId,
+                                IMimeTypeDetector $mimeTypeDetector,
+                                IPreview $previewManager) {
+        parent::__construct($appName, $request);
 
-		$this->rootFolder = $rootFolder;
-		$this->userId = $userId;
-		$this->mimeTypeDetector = $mimeTypeDetector;
-		$this->previewManager = $previewManager;
-	}
+        $this->rootFolder = $rootFolder;
+        $this->userId = $userId;
+        $this->mimeTypeDetector = $mimeTypeDetector;
+        $this->previewManager = $previewManager;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param string $file
-	 * @param int $x
-	 * @param int $y
-	 * @param string $version
-	 * @return DataResponse|FileDisplayResponse
-	 */
-	public function getPreview(
-		$file = '',
-		$x = 44,
-		$y = 44,
-		$version = ''
-	) {
-		if($file === '' || $version === '' || $x === 0 || $y === 0) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param string $file
+     * @param int $x
+     * @param int $y
+     * @param string $version
+     * @return DataResponse|FileDisplayResponse
+     */
+    public function getPreview(
+        $file = '',
+        $x = 44,
+        $y = 44,
+        $version = ''
+    ) {
+        if($file === '' || $version === '' || $x === 0 || $y === 0) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
 
-		try {
-			$userFolder = $this->rootFolder->getUserFolder($this->userId);
-			/** @var Folder $versionFolder */
-			$versionFolder = $userFolder->getParent()->get('files_versions');
-			$mimeType = $this->mimeTypeDetector->detectPath($file);
-			$file = $versionFolder->get($file.'.v'.$version);
+        try {
+            $userFolder = $this->rootFolder->getUserFolder($this->userId);
+            /** @var Folder $versionFolder */
+            $versionFolder = $userFolder->getParent()->get('files_versions');
+            $mimeType = $this->mimeTypeDetector->detectPath($file);
+            $file = $versionFolder->get($file.'.v'.$version);
 
-			/** @var File $file */
-			$f = $this->previewManager->getPreview($file, $x, $y, true, IPreview::MODE_FILL, $mimeType);
-			return new FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
-		} catch (NotFoundException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-	}
+            /** @var File $file */
+            $f = $this->previewManager->getPreview($file, $x, $y, true, IPreview::MODE_FILL, $mimeType);
+            return new FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
+        } catch (NotFoundException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+    }
 }