nextcloud / server

lib/private/App/PlatformRepository.php

Indentation +196 added lines, -196 removed lines

@@ -30,200 +30,200 @@
  * @package OC\App
  */
 class PlatformRepository {
-	public function __construct() {
-		$this->packages = $this->initialize();
-	}
-
-	protected function initialize() {
-		$loadedExtensions = get_loaded_extensions();
-		$packages = array();
-
-		// Extensions scanning
-		foreach ($loadedExtensions as $name) {
-			if (in_array($name, array('standard', 'Core'))) {
-				continue;
-			}
-
-			$ext = new \ReflectionExtension($name);
-			try {
-				$prettyVersion = $ext->getVersion();
-				$prettyVersion = $this->normalizeVersion($prettyVersion);
-			} catch (\UnexpectedValueException $e) {
-				$prettyVersion = '0';
-				$prettyVersion = $this->normalizeVersion($prettyVersion);
-			}
-
-			$packages[$this->buildPackageName($name)] = $prettyVersion;
-		}
-
-		foreach ($loadedExtensions as $name) {
-			$prettyVersion = null;
-			switch ($name) {
-				case 'curl':
-					$curlVersion = curl_version();
-					$prettyVersion = $curlVersion['version'];
-					break;
-
-				case 'iconv':
-					$prettyVersion = ICONV_VERSION;
-					break;
-
-				case 'intl':
-					$name = 'ICU';
-					if (defined('INTL_ICU_VERSION')) {
-						$prettyVersion = INTL_ICU_VERSION;
-					} else {
-						$reflector = new \ReflectionExtension('intl');
-
-						ob_start();
-						$reflector->info();
-						$output = ob_get_clean();
-
-						preg_match('/^ICU version => (.*)$/m', $output, $matches);
-						$prettyVersion = $matches[1];
-					}
-
-					break;
-
-				case 'libxml':
-					$prettyVersion = LIBXML_DOTTED_VERSION;
-					break;
-
-				case 'openssl':
-					$prettyVersion = preg_replace_callback('{^(?:OpenSSL\s*)?([0-9.]+)([a-z]?).*}', function ($match) {
-						return $match[1] . (empty($match[2]) ? '' : '.' . (ord($match[2]) - 96));
-					}, OPENSSL_VERSION_TEXT);
-					break;
-
-				case 'pcre':
-					$prettyVersion = preg_replace('{^(\S+).*}', '$1', PCRE_VERSION);
-					break;
-
-				case 'uuid':
-					$prettyVersion = phpversion('uuid');
-					break;
-
-				case 'xsl':
-					$prettyVersion = LIBXSLT_DOTTED_VERSION;
-					break;
-
-				default:
-					// None handled extensions have no special cases, skip
-					continue 2;
-			}
-
-			try {
-				$prettyVersion = $this->normalizeVersion($prettyVersion);
-			} catch (\UnexpectedValueException $e) {
-				continue;
-			}
-
-			$packages[$this->buildPackageName($name)] = $prettyVersion;
-		}
-
-		return $packages;
-	}
-
-	private function buildPackageName($name) {
-		return str_replace(' ', '-', $name);
-	}
-
-	/**
-	 * @param $name
-	 * @return string
-	 */
-	public function findLibrary($name) {
-		$extName = $this->buildPackageName($name);
-		if (isset($this->packages[$extName])) {
-			return $this->packages[$extName];
-		}
-		return null;
-	}
-
-	private static $modifierRegex = '[._-]?(?:(stable|beta|b|RC|alpha|a|patch|pl|p)(?:[.-]?(\d+))?)?([.-]?dev)?';
-
-	/**
-	 * Normalizes a version string to be able to perform comparisons on it
-	 *
-	 * https://github.com/composer/composer/blob/master/src/Composer/Package/Version/VersionParser.php#L94
-	 *
-	 * @param string $version
-	 * @param string $fullVersion optional complete version string to give more context
-	 * @throws \UnexpectedValueException
-	 * @return string
-	 */
-	public function normalizeVersion($version, $fullVersion = null) {
-		$version = trim($version);
-		if (null === $fullVersion) {
-			$fullVersion = $version;
-		}
-		// ignore aliases and just assume the alias is required instead of the source
-		if (preg_match('{^([^,\s]+) +as +([^,\s]+)$}', $version, $match)) {
-			$version = $match[1];
-		}
-		// match master-like branches
-		if (preg_match('{^(?:dev-)?(?:master|trunk|default)$}i', $version)) {
-			return '9999999-dev';
-		}
-		if ('dev-' === strtolower(substr($version, 0, 4))) {
-			return 'dev-' . substr($version, 4);
-		}
-		// match classical versioning
-		if (preg_match('{^v?(\d{1,3})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) {
-			$version = $matches[1]
-				. (!empty($matches[2]) ? $matches[2] : '.0')
-				. (!empty($matches[3]) ? $matches[3] : '.0')
-				. (!empty($matches[4]) ? $matches[4] : '.0');
-			$index = 5;
-		} elseif (preg_match('{^v?(\d{4}(?:[.:-]?\d{2}){1,6}(?:[.:-]?\d{1,3})?)' . self::$modifierRegex . '$}i', $version, $matches)) { // match date-based versioning
-			$version = preg_replace('{\D}', '-', $matches[1]);
-			$index = 2;
-		} elseif (preg_match('{^v?(\d{4,})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) {
-			$version = $matches[1]
-				. (!empty($matches[2]) ? $matches[2] : '.0')
-				. (!empty($matches[3]) ? $matches[3] : '.0')
-				. (!empty($matches[4]) ? $matches[4] : '.0');
-			$index = 5;
-		}
-		// add version modifiers if a version was matched
-		if (isset($index)) {
-			if (!empty($matches[$index])) {
-				if ('stable' === $matches[$index]) {
-					return $version;
-				}
-				$version .= '-' . $this->expandStability($matches[$index]) . (!empty($matches[$index + 1]) ? $matches[$index + 1] : '');
-			}
-			if (!empty($matches[$index + 2])) {
-				$version .= '-dev';
-			}
-			return $version;
-		}
-		$extraMessage = '';
-		if (preg_match('{ +as +' . preg_quote($version) . '$}', $fullVersion)) {
-			$extraMessage = ' in "' . $fullVersion . '", the alias must be an exact version';
-		} elseif (preg_match('{^' . preg_quote($version) . ' +as +}', $fullVersion)) {
-			$extraMessage = ' in "' . $fullVersion . '", the alias source must be an exact version, if it is a branch name you should prefix it with dev-';
-		}
-		throw new \UnexpectedValueException('Invalid version string "' . $version . '"' . $extraMessage);
-	}
-
-	/**
-	 * @param string $stability
-	 */
-	private function expandStability($stability) {
-		$stability = strtolower($stability);
-		switch ($stability) {
-			case 'a':
-				return 'alpha';
-			case 'b':
-				return 'beta';
-			case 'p':
-			case 'pl':
-				return 'patch';
-			case 'rc':
-				return 'RC';
-			default:
-				return $stability;
-		}
-	}
+    public function __construct() {
+        $this->packages = $this->initialize();
+    }
+
+    protected function initialize() {
+        $loadedExtensions = get_loaded_extensions();
+        $packages = array();
+
+        // Extensions scanning
+        foreach ($loadedExtensions as $name) {
+            if (in_array($name, array('standard', 'Core'))) {
+                continue;
+            }
+
+            $ext = new \ReflectionExtension($name);
+            try {
+                $prettyVersion = $ext->getVersion();
+                $prettyVersion = $this->normalizeVersion($prettyVersion);
+            } catch (\UnexpectedValueException $e) {
+                $prettyVersion = '0';
+                $prettyVersion = $this->normalizeVersion($prettyVersion);
+            }
+
+            $packages[$this->buildPackageName($name)] = $prettyVersion;
+        }
+
+        foreach ($loadedExtensions as $name) {
+            $prettyVersion = null;
+            switch ($name) {
+                case 'curl':
+                    $curlVersion = curl_version();
+                    $prettyVersion = $curlVersion['version'];
+                    break;
+
+                case 'iconv':
+                    $prettyVersion = ICONV_VERSION;
+                    break;
+
+                case 'intl':
+                    $name = 'ICU';
+                    if (defined('INTL_ICU_VERSION')) {
+                        $prettyVersion = INTL_ICU_VERSION;
+                    } else {
+                        $reflector = new \ReflectionExtension('intl');
+
+                        ob_start();
+                        $reflector->info();
+                        $output = ob_get_clean();
+
+                        preg_match('/^ICU version => (.*)$/m', $output, $matches);
+                        $prettyVersion = $matches[1];
+                    }
+
+                    break;
+
+                case 'libxml':
+                    $prettyVersion = LIBXML_DOTTED_VERSION;
+                    break;
+
+                case 'openssl':
+                    $prettyVersion = preg_replace_callback('{^(?:OpenSSL\s*)?([0-9.]+)([a-z]?).*}', function ($match) {
+                        return $match[1] . (empty($match[2]) ? '' : '.' . (ord($match[2]) - 96));
+                    }, OPENSSL_VERSION_TEXT);
+                    break;
+
+                case 'pcre':
+                    $prettyVersion = preg_replace('{^(\S+).*}', '$1', PCRE_VERSION);
+                    break;
+
+                case 'uuid':
+                    $prettyVersion = phpversion('uuid');
+                    break;
+
+                case 'xsl':
+                    $prettyVersion = LIBXSLT_DOTTED_VERSION;
+                    break;
+
+                default:
+                    // None handled extensions have no special cases, skip
+                    continue 2;
+            }
+
+            try {
+                $prettyVersion = $this->normalizeVersion($prettyVersion);
+            } catch (\UnexpectedValueException $e) {
+                continue;
+            }
+
+            $packages[$this->buildPackageName($name)] = $prettyVersion;
+        }
+
+        return $packages;
+    }
+
+    private function buildPackageName($name) {
+        return str_replace(' ', '-', $name);
+    }
+
+    /**
+     * @param $name
+     * @return string
+     */
+    public function findLibrary($name) {
+        $extName = $this->buildPackageName($name);
+        if (isset($this->packages[$extName])) {
+            return $this->packages[$extName];
+        }
+        return null;
+    }
+
+    private static $modifierRegex = '[._-]?(?:(stable|beta|b|RC|alpha|a|patch|pl|p)(?:[.-]?(\d+))?)?([.-]?dev)?';
+
+    /**
+     * Normalizes a version string to be able to perform comparisons on it
+     *
+     * https://github.com/composer/composer/blob/master/src/Composer/Package/Version/VersionParser.php#L94
+     *
+     * @param string $version
+     * @param string $fullVersion optional complete version string to give more context
+     * @throws \UnexpectedValueException
+     * @return string
+     */
+    public function normalizeVersion($version, $fullVersion = null) {
+        $version = trim($version);
+        if (null === $fullVersion) {
+            $fullVersion = $version;
+        }
+        // ignore aliases and just assume the alias is required instead of the source
+        if (preg_match('{^([^,\s]+) +as +([^,\s]+)$}', $version, $match)) {
+            $version = $match[1];
+        }
+        // match master-like branches
+        if (preg_match('{^(?:dev-)?(?:master|trunk|default)$}i', $version)) {
+            return '9999999-dev';
+        }
+        if ('dev-' === strtolower(substr($version, 0, 4))) {
+            return 'dev-' . substr($version, 4);
+        }
+        // match classical versioning
+        if (preg_match('{^v?(\d{1,3})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) {
+            $version = $matches[1]
+                . (!empty($matches[2]) ? $matches[2] : '.0')
+                . (!empty($matches[3]) ? $matches[3] : '.0')
+                . (!empty($matches[4]) ? $matches[4] : '.0');
+            $index = 5;
+        } elseif (preg_match('{^v?(\d{4}(?:[.:-]?\d{2}){1,6}(?:[.:-]?\d{1,3})?)' . self::$modifierRegex . '$}i', $version, $matches)) { // match date-based versioning
+            $version = preg_replace('{\D}', '-', $matches[1]);
+            $index = 2;
+        } elseif (preg_match('{^v?(\d{4,})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) {
+            $version = $matches[1]
+                . (!empty($matches[2]) ? $matches[2] : '.0')
+                . (!empty($matches[3]) ? $matches[3] : '.0')
+                . (!empty($matches[4]) ? $matches[4] : '.0');
+            $index = 5;
+        }
+        // add version modifiers if a version was matched
+        if (isset($index)) {
+            if (!empty($matches[$index])) {
+                if ('stable' === $matches[$index]) {
+                    return $version;
+                }
+                $version .= '-' . $this->expandStability($matches[$index]) . (!empty($matches[$index + 1]) ? $matches[$index + 1] : '');
+            }
+            if (!empty($matches[$index + 2])) {
+                $version .= '-dev';
+            }
+            return $version;
+        }
+        $extraMessage = '';
+        if (preg_match('{ +as +' . preg_quote($version) . '$}', $fullVersion)) {
+            $extraMessage = ' in "' . $fullVersion . '", the alias must be an exact version';
+        } elseif (preg_match('{^' . preg_quote($version) . ' +as +}', $fullVersion)) {
+            $extraMessage = ' in "' . $fullVersion . '", the alias source must be an exact version, if it is a branch name you should prefix it with dev-';
+        }
+        throw new \UnexpectedValueException('Invalid version string "' . $version . '"' . $extraMessage);
+    }
+
+    /**
+     * @param string $stability
+     */
+    private function expandStability($stability) {
+        $stability = strtolower($stability);
+        switch ($stability) {
+            case 'a':
+                return 'alpha';
+            case 'b':
+                return 'beta';
+            case 'p':
+            case 'pl':
+                return 'patch';
+            case 'rc':
+                return 'RC';
+            default:
+                return $stability;
+        }
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -90,8 +90,8 @@ 
 					break;
 
 				case 'openssl':
-					$prettyVersion = preg_replace_callback('{^(?:OpenSSL\s*)?([0-9.]+)([a-z]?).*}', function ($match) {
-						return $match[1] . (empty($match[2]) ? '' : '.' . (ord($match[2]) - 96));
+					$prettyVersion = preg_replace_callback('{^(?:OpenSSL\s*)?([0-9.]+)([a-z]?).*}', function($match) {
+						return $match[1].(empty($match[2]) ? '' : '.'.(ord($match[2]) - 96));
 					}, OPENSSL_VERSION_TEXT);
 					break;
 
@@ -166,19 +166,19 @@ 
 			return '9999999-dev';
 		}
 		if ('dev-' === strtolower(substr($version, 0, 4))) {
-			return 'dev-' . substr($version, 4);
+			return 'dev-'.substr($version, 4);
 		}
 		// match classical versioning
-		if (preg_match('{^v?(\d{1,3})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) {
+		if (preg_match('{^v?(\d{1,3})(\.\d+)?(\.\d+)?(\.\d+)?'.self::$modifierRegex.'$}i', $version, $matches)) {
 			$version = $matches[1]
 				. (!empty($matches[2]) ? $matches[2] : '.0')
 				. (!empty($matches[3]) ? $matches[3] : '.0')
 				. (!empty($matches[4]) ? $matches[4] : '.0');
 			$index = 5;
-		} elseif (preg_match('{^v?(\d{4}(?:[.:-]?\d{2}){1,6}(?:[.:-]?\d{1,3})?)' . self::$modifierRegex . '$}i', $version, $matches)) { // match date-based versioning
+		} elseif (preg_match('{^v?(\d{4}(?:[.:-]?\d{2}){1,6}(?:[.:-]?\d{1,3})?)'.self::$modifierRegex.'$}i', $version, $matches)) { // match date-based versioning
 			$version = preg_replace('{\D}', '-', $matches[1]);
 			$index = 2;
-		} elseif (preg_match('{^v?(\d{4,})(\.\d+)?(\.\d+)?(\.\d+)?' . self::$modifierRegex . '$}i', $version, $matches)) {
+		} elseif (preg_match('{^v?(\d{4,})(\.\d+)?(\.\d+)?(\.\d+)?'.self::$modifierRegex.'$}i', $version, $matches)) {
 			$version = $matches[1]
 				. (!empty($matches[2]) ? $matches[2] : '.0')
 				. (!empty($matches[3]) ? $matches[3] : '.0')
@@ -191,7 +191,7 @@ 
 				if ('stable' === $matches[$index]) {
 					return $version;
 				}
-				$version .= '-' . $this->expandStability($matches[$index]) . (!empty($matches[$index + 1]) ? $matches[$index + 1] : '');
+				$version .= '-'.$this->expandStability($matches[$index]).(!empty($matches[$index + 1]) ? $matches[$index + 1] : '');
 			}
 			if (!empty($matches[$index + 2])) {
 				$version .= '-dev';
@@ -199,12 +199,12 @@ 
 			return $version;
 		}
 		$extraMessage = '';
-		if (preg_match('{ +as +' . preg_quote($version) . '$}', $fullVersion)) {
-			$extraMessage = ' in "' . $fullVersion . '", the alias must be an exact version';
-		} elseif (preg_match('{^' . preg_quote($version) . ' +as +}', $fullVersion)) {
-			$extraMessage = ' in "' . $fullVersion . '", the alias source must be an exact version, if it is a branch name you should prefix it with dev-';
+		if (preg_match('{ +as +'.preg_quote($version).'$}', $fullVersion)) {
+			$extraMessage = ' in "'.$fullVersion.'", the alias must be an exact version';
+		} elseif (preg_match('{^'.preg_quote($version).' +as +}', $fullVersion)) {
+			$extraMessage = ' in "'.$fullVersion.'", the alias source must be an exact version, if it is a branch name you should prefix it with dev-';
 		}
-		throw new \UnexpectedValueException('Invalid version string "' . $version . '"' . $extraMessage);
+		throw new \UnexpectedValueException('Invalid version string "'.$version.'"'.$extraMessage);
 	}
 
 	/**

lib/private/DateTimeFormatter.php

Spacing +2 added lines, -2 removed lines

@@ -237,7 +237,7 @@ 
 	 * @return string Formatted date and time string
 	 */
 	public function formatDateTime($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
-		return $this->format($timestamp, 'datetime', $formatDate . '|' . $formatTime, $timeZone, $l);
+		return $this->format($timestamp, 'datetime', $formatDate.'|'.$formatTime, $timeZone, $l);
 	}
 
 	/**
@@ -256,7 +256,7 @@ 
 			$formatDate .= '^';
 		}
 
-		return $this->format($timestamp, 'datetime', $formatDate . '|' . $formatTime, $timeZone, $l);
+		return $this->format($timestamp, 'datetime', $formatDate.'|'.$formatTime, $timeZone, $l);
 	}
 
 	/**

Indentation +268 added lines, -268 removed lines

@@ -25,294 +25,294 @@
 namespace OC;
 
 class DateTimeFormatter implements \OCP\IDateTimeFormatter {
-	/** @var \DateTimeZone */
-	protected $defaultTimeZone;
+    /** @var \DateTimeZone */
+    protected $defaultTimeZone;
 
-	/** @var \OCP\IL10N */
-	protected $defaultL10N;
+    /** @var \OCP\IL10N */
+    protected $defaultL10N;
 
-	/**
-	 * Constructor
-	 *
-	 * @param \DateTimeZone $defaultTimeZone Set the timezone for the format
-	 * @param \OCP\IL10N $defaultL10N Set the language for the format
-	 */
-	public function __construct(\DateTimeZone $defaultTimeZone, \OCP\IL10N $defaultL10N) {
-		$this->defaultTimeZone = $defaultTimeZone;
-		$this->defaultL10N = $defaultL10N;
-	}
+    /**
+     * Constructor
+     *
+     * @param \DateTimeZone $defaultTimeZone Set the timezone for the format
+     * @param \OCP\IL10N $defaultL10N Set the language for the format
+     */
+    public function __construct(\DateTimeZone $defaultTimeZone, \OCP\IL10N $defaultL10N) {
+        $this->defaultTimeZone = $defaultTimeZone;
+        $this->defaultL10N = $defaultL10N;
+    }
 
-	/**
-	 * Get TimeZone to use
-	 *
-	 * @param \DateTimeZone $timeZone	The timezone to use
-	 * @return \DateTimeZone		The timezone to use, falling back to the current user's timezone
-	 */
-	protected function getTimeZone($timeZone = null) {
-		if ($timeZone === null) {
-			$timeZone = $this->defaultTimeZone;
-		}
+    /**
+     * Get TimeZone to use
+     *
+     * @param \DateTimeZone $timeZone	The timezone to use
+     * @return \DateTimeZone		The timezone to use, falling back to the current user's timezone
+     */
+    protected function getTimeZone($timeZone = null) {
+        if ($timeZone === null) {
+            $timeZone = $this->defaultTimeZone;
+        }
 
-		return $timeZone;
-	}
+        return $timeZone;
+    }
 
-	/**
-	 * Get \OCP\IL10N to use
-	 *
-	 * @param \OCP\IL10N $l	The locale to use
-	 * @return \OCP\IL10N		The locale to use, falling back to the current user's locale
-	 */
-	protected function getLocale($l = null) {
-		if ($l === null) {
-			$l = $this->defaultL10N;
-		}
+    /**
+     * Get \OCP\IL10N to use
+     *
+     * @param \OCP\IL10N $l	The locale to use
+     * @return \OCP\IL10N		The locale to use, falling back to the current user's locale
+     */
+    protected function getLocale($l = null) {
+        if ($l === null) {
+            $l = $this->defaultL10N;
+        }
 
-		return $l;
-	}
+        return $l;
+    }
 
-	/**
-	 * Generates a DateTime object with the given timestamp and TimeZone
-	 *
-	 * @param mixed $timestamp
-	 * @param \DateTimeZone $timeZone	The timezone to use
-	 * @return \DateTime
-	 */
-	protected function getDateTime($timestamp, \DateTimeZone $timeZone = null) {
-		if ($timestamp === null) {
-			return new \DateTime('now', $timeZone);
-		} else if (!$timestamp instanceof \DateTime) {
-			$dateTime = new \DateTime('now', $timeZone);
-			$dateTime->setTimestamp($timestamp);
-			return $dateTime;
-		}
-		if ($timeZone) {
-			$timestamp->setTimezone($timeZone);
-		}
-		return $timestamp;
-	}
+    /**
+     * Generates a DateTime object with the given timestamp and TimeZone
+     *
+     * @param mixed $timestamp
+     * @param \DateTimeZone $timeZone	The timezone to use
+     * @return \DateTime
+     */
+    protected function getDateTime($timestamp, \DateTimeZone $timeZone = null) {
+        if ($timestamp === null) {
+            return new \DateTime('now', $timeZone);
+        } else if (!$timestamp instanceof \DateTime) {
+            $dateTime = new \DateTime('now', $timeZone);
+            $dateTime->setTimestamp($timestamp);
+            return $dateTime;
+        }
+        if ($timeZone) {
+            $timestamp->setTimezone($timeZone);
+        }
+        return $timestamp;
+    }
 
-	/**
-	 * Formats the date of the given timestamp
-	 *
-	 * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
-	 * @param string	$format			Either 'full', 'long', 'medium' or 'short'
-	 * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
-	 * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
-	 * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
-	 * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
-	 * 				The exact format is dependent on the language
-	 * @param \DateTimeZone	$timeZone	The timezone to use
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted date string
-	 */
-	public function formatDate($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
-		return $this->format($timestamp, 'date', $format, $timeZone, $l);
-	}
+    /**
+     * Formats the date of the given timestamp
+     *
+     * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
+     * @param string	$format			Either 'full', 'long', 'medium' or 'short'
+     * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
+     * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
+     * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
+     * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
+     * 				The exact format is dependent on the language
+     * @param \DateTimeZone	$timeZone	The timezone to use
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted date string
+     */
+    public function formatDate($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+        return $this->format($timestamp, 'date', $format, $timeZone, $l);
+    }
 
-	/**
-	 * Formats the date of the given timestamp
-	 *
-	 * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
-	 * @param string	$format			Either 'full', 'long', 'medium' or 'short'
-	 * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
-	 * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
-	 * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
-	 * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
-	 * 				The exact format is dependent on the language
-	 * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
-	 * @param \DateTimeZone	$timeZone	The timezone to use
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted relative date string
-	 */
-	public function formatDateRelativeDay($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
-		if (substr($format, -1) !== '*' && substr($format, -1) !== '*') {
-			$format .= '^';
-		}
+    /**
+     * Formats the date of the given timestamp
+     *
+     * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
+     * @param string	$format			Either 'full', 'long', 'medium' or 'short'
+     * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
+     * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
+     * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
+     * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
+     * 				The exact format is dependent on the language
+     * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
+     * @param \DateTimeZone	$timeZone	The timezone to use
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted relative date string
+     */
+    public function formatDateRelativeDay($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+        if (substr($format, -1) !== '*' && substr($format, -1) !== '*') {
+            $format .= '^';
+        }
 
-		return $this->format($timestamp, 'date', $format, $timeZone, $l);
-	}
+        return $this->format($timestamp, 'date', $format, $timeZone, $l);
+    }
 
-	/**
-	 * Gives the relative date of the timestamp
-	 * Only works for past dates
-	 *
-	 * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
-	 * @param int|\DateTime	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
-	 * @return string	Dates returned are:
-	 * 				<  1 month	=> Today, Yesterday, n days ago
-	 * 				< 13 month	=> last month, n months ago
-	 * 				>= 13 month	=> last year, n years ago
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted date span
-	 */
-	public function formatDateSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null) {
-		$l = $this->getLocale($l);
-		$timestamp = $this->getDateTime($timestamp);
-		$timestamp->setTime(0, 0, 0);
+    /**
+     * Gives the relative date of the timestamp
+     * Only works for past dates
+     *
+     * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
+     * @param int|\DateTime	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
+     * @return string	Dates returned are:
+     * 				<  1 month	=> Today, Yesterday, n days ago
+     * 				< 13 month	=> last month, n months ago
+     * 				>= 13 month	=> last year, n years ago
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted date span
+     */
+    public function formatDateSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null) {
+        $l = $this->getLocale($l);
+        $timestamp = $this->getDateTime($timestamp);
+        $timestamp->setTime(0, 0, 0);
 
-		if ($baseTimestamp === null) {
-			$baseTimestamp = time();
-		}
-		$baseTimestamp = $this->getDateTime($baseTimestamp);
-		$baseTimestamp->setTime(0, 0, 0);
-		$dateInterval = $timestamp->diff($baseTimestamp);
+        if ($baseTimestamp === null) {
+            $baseTimestamp = time();
+        }
+        $baseTimestamp = $this->getDateTime($baseTimestamp);
+        $baseTimestamp->setTime(0, 0, 0);
+        $dateInterval = $timestamp->diff($baseTimestamp);
 
-		if ($dateInterval->y == 0 && $dateInterval->m == 0 && $dateInterval->d == 0) {
-			return $l->t('today');
-		} else if ($dateInterval->y == 0 && $dateInterval->m == 0 && $dateInterval->d == 1) {
-			if ($timestamp > $baseTimestamp) {
-				return $l->t('tomorrow');
-			} else {
-				return $l->t('yesterday');
-			}
-		} else if ($dateInterval->y == 0 && $dateInterval->m == 0) {
-			if ($timestamp > $baseTimestamp) {
-				return $l->n('in %n day', 'in %n days', $dateInterval->d);
-			} else {
-				return $l->n('%n day ago', '%n days ago', $dateInterval->d);
-			}
-		} else if ($dateInterval->y == 0 && $dateInterval->m == 1) {
-			if ($timestamp > $baseTimestamp) {
-				return $l->t('next month');
-			} else {
-				return $l->t('last month');
-			}
-		} else if ($dateInterval->y == 0) {
-			if ($timestamp > $baseTimestamp) {
-				return $l->n('in %n month', 'in %n months', $dateInterval->m);
-			} else {
-				return $l->n('%n month ago', '%n months ago', $dateInterval->m);
-			}
-		} else if ($dateInterval->y == 1) {
-			if ($timestamp > $baseTimestamp) {
-				return $l->t('next year');
-			} else {
-				return $l->t('last year');
-			}
-		}
-		if ($timestamp > $baseTimestamp) {
-			return $l->n('in %n year', 'in %n years', $dateInterval->y);
-		} else {
-			return $l->n('%n year ago', '%n years ago', $dateInterval->y);
-		}
-	}
+        if ($dateInterval->y == 0 && $dateInterval->m == 0 && $dateInterval->d == 0) {
+            return $l->t('today');
+        } else if ($dateInterval->y == 0 && $dateInterval->m == 0 && $dateInterval->d == 1) {
+            if ($timestamp > $baseTimestamp) {
+                return $l->t('tomorrow');
+            } else {
+                return $l->t('yesterday');
+            }
+        } else if ($dateInterval->y == 0 && $dateInterval->m == 0) {
+            if ($timestamp > $baseTimestamp) {
+                return $l->n('in %n day', 'in %n days', $dateInterval->d);
+            } else {
+                return $l->n('%n day ago', '%n days ago', $dateInterval->d);
+            }
+        } else if ($dateInterval->y == 0 && $dateInterval->m == 1) {
+            if ($timestamp > $baseTimestamp) {
+                return $l->t('next month');
+            } else {
+                return $l->t('last month');
+            }
+        } else if ($dateInterval->y == 0) {
+            if ($timestamp > $baseTimestamp) {
+                return $l->n('in %n month', 'in %n months', $dateInterval->m);
+            } else {
+                return $l->n('%n month ago', '%n months ago', $dateInterval->m);
+            }
+        } else if ($dateInterval->y == 1) {
+            if ($timestamp > $baseTimestamp) {
+                return $l->t('next year');
+            } else {
+                return $l->t('last year');
+            }
+        }
+        if ($timestamp > $baseTimestamp) {
+            return $l->n('in %n year', 'in %n years', $dateInterval->y);
+        } else {
+            return $l->n('%n year ago', '%n years ago', $dateInterval->y);
+        }
+    }
 
-	/**
-	 * Formats the time of the given timestamp
-	 *
-	 * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
-	 * @param string	$format			Either 'full', 'long', 'medium' or 'short'
-	 * 				full:	e.g. 'h:mm:ss a zzzz'	=> '11:42:13 AM GMT+0:00'
-	 * 				long:	e.g. 'h:mm:ss a z'		=> '11:42:13 AM GMT'
-	 * 				medium:	e.g. 'h:mm:ss a'		=> '11:42:13 AM'
-	 * 				short:	e.g. 'h:mm a'			=> '11:42 AM'
-	 * 				The exact format is dependent on the language
-	 * @param \DateTimeZone	$timeZone	The timezone to use
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted time string
-	 */
-	public function formatTime($timestamp, $format = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
-		return $this->format($timestamp, 'time', $format, $timeZone, $l);
-	}
+    /**
+     * Formats the time of the given timestamp
+     *
+     * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
+     * @param string	$format			Either 'full', 'long', 'medium' or 'short'
+     * 				full:	e.g. 'h:mm:ss a zzzz'	=> '11:42:13 AM GMT+0:00'
+     * 				long:	e.g. 'h:mm:ss a z'		=> '11:42:13 AM GMT'
+     * 				medium:	e.g. 'h:mm:ss a'		=> '11:42:13 AM'
+     * 				short:	e.g. 'h:mm a'			=> '11:42 AM'
+     * 				The exact format is dependent on the language
+     * @param \DateTimeZone	$timeZone	The timezone to use
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted time string
+     */
+    public function formatTime($timestamp, $format = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+        return $this->format($timestamp, 'time', $format, $timeZone, $l);
+    }
 
-	/**
-	 * Gives the relative past time of the timestamp
-	 *
-	 * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
-	 * @param int|\DateTime	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
-	 * @return string	Dates returned are:
-	 * 				< 60 sec	=> seconds ago
-	 * 				<  1 hour	=> n minutes ago
-	 * 				<  1 day	=> n hours ago
-	 * 				<  1 month	=> Yesterday, n days ago
-	 * 				< 13 month	=> last month, n months ago
-	 * 				>= 13 month	=> last year, n years ago
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted time span
-	 */
-	public function formatTimeSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null) {
-		$l = $this->getLocale($l);
-		$timestamp = $this->getDateTime($timestamp);
-		if ($baseTimestamp === null) {
-			$baseTimestamp = time();
-		}
-		$baseTimestamp = $this->getDateTime($baseTimestamp);
+    /**
+     * Gives the relative past time of the timestamp
+     *
+     * @param int|\DateTime	$timestamp	Either a Unix timestamp or DateTime object
+     * @param int|\DateTime	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
+     * @return string	Dates returned are:
+     * 				< 60 sec	=> seconds ago
+     * 				<  1 hour	=> n minutes ago
+     * 				<  1 day	=> n hours ago
+     * 				<  1 month	=> Yesterday, n days ago
+     * 				< 13 month	=> last month, n months ago
+     * 				>= 13 month	=> last year, n years ago
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted time span
+     */
+    public function formatTimeSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null) {
+        $l = $this->getLocale($l);
+        $timestamp = $this->getDateTime($timestamp);
+        if ($baseTimestamp === null) {
+            $baseTimestamp = time();
+        }
+        $baseTimestamp = $this->getDateTime($baseTimestamp);
 
-		$diff = $timestamp->diff($baseTimestamp);
-		if ($diff->y > 0 || $diff->m > 0 || $diff->d > 0) {
-			return $this->formatDateSpan($timestamp, $baseTimestamp, $l);
-		}
+        $diff = $timestamp->diff($baseTimestamp);
+        if ($diff->y > 0 || $diff->m > 0 || $diff->d > 0) {
+            return $this->formatDateSpan($timestamp, $baseTimestamp, $l);
+        }
 
-		if ($diff->h > 0) {
-			if ($timestamp > $baseTimestamp) {
-				return $l->n('in %n hour', 'in %n hours', $diff->h);
-			} else {
-				return $l->n('%n hour ago', '%n hours ago', $diff->h);
-			}
-		} else if ($diff->i > 0) {
-			if ($timestamp > $baseTimestamp) {
-				return $l->n('in %n minute', 'in %n minutes', $diff->i);
-			} else {
-				return $l->n('%n minute ago', '%n minutes ago', $diff->i);
-			}
-		}
-		if ($timestamp > $baseTimestamp) {
-			return $l->t('in a few seconds');
-		} else {
-			return $l->t('seconds ago');
-		}
-	}
+        if ($diff->h > 0) {
+            if ($timestamp > $baseTimestamp) {
+                return $l->n('in %n hour', 'in %n hours', $diff->h);
+            } else {
+                return $l->n('%n hour ago', '%n hours ago', $diff->h);
+            }
+        } else if ($diff->i > 0) {
+            if ($timestamp > $baseTimestamp) {
+                return $l->n('in %n minute', 'in %n minutes', $diff->i);
+            } else {
+                return $l->n('%n minute ago', '%n minutes ago', $diff->i);
+            }
+        }
+        if ($timestamp > $baseTimestamp) {
+            return $l->t('in a few seconds');
+        } else {
+            return $l->t('seconds ago');
+        }
+    }
 
-	/**
-	 * Formats the date and time of the given timestamp
-	 *
-	 * @param int|\DateTime $timestamp	Either a Unix timestamp or DateTime object
-	 * @param string		$formatDate		See formatDate() for description
-	 * @param string		$formatTime		See formatTime() for description
-	 * @param \DateTimeZone	$timeZone	The timezone to use
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted date and time string
-	 */
-	public function formatDateTime($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
-		return $this->format($timestamp, 'datetime', $formatDate . '|' . $formatTime, $timeZone, $l);
-	}
+    /**
+     * Formats the date and time of the given timestamp
+     *
+     * @param int|\DateTime $timestamp	Either a Unix timestamp or DateTime object
+     * @param string		$formatDate		See formatDate() for description
+     * @param string		$formatTime		See formatTime() for description
+     * @param \DateTimeZone	$timeZone	The timezone to use
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted date and time string
+     */
+    public function formatDateTime($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+        return $this->format($timestamp, 'datetime', $formatDate . '|' . $formatTime, $timeZone, $l);
+    }
 
-	/**
-	 * Formats the date and time of the given timestamp
-	 *
-	 * @param int|\DateTime $timestamp	Either a Unix timestamp or DateTime object
-	 * @param string	$formatDate		See formatDate() for description
-	 * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
-	 * @param string	$formatTime		See formatTime() for description
-	 * @param \DateTimeZone	$timeZone	The timezone to use
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted relative date and time string
-	 */
-	public function formatDateTimeRelativeDay($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
-		if (substr($formatDate, -1) !== '^' && substr($formatDate, -1) !== '*') {
-			$formatDate .= '^';
-		}
+    /**
+     * Formats the date and time of the given timestamp
+     *
+     * @param int|\DateTime $timestamp	Either a Unix timestamp or DateTime object
+     * @param string	$formatDate		See formatDate() for description
+     * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
+     * @param string	$formatTime		See formatTime() for description
+     * @param \DateTimeZone	$timeZone	The timezone to use
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted relative date and time string
+     */
+    public function formatDateTimeRelativeDay($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+        if (substr($formatDate, -1) !== '^' && substr($formatDate, -1) !== '*') {
+            $formatDate .= '^';
+        }
 
-		return $this->format($timestamp, 'datetime', $formatDate . '|' . $formatTime, $timeZone, $l);
-	}
+        return $this->format($timestamp, 'datetime', $formatDate . '|' . $formatTime, $timeZone, $l);
+    }
 
-	/**
-	 * Formats the date and time of the given timestamp
-	 *
-	 * @param int|\DateTime $timestamp	Either a Unix timestamp or DateTime object
-	 * @param string		$type		One of 'date', 'datetime' or 'time'
-	 * @param string		$format		Format string
-	 * @param \DateTimeZone	$timeZone	The timezone to use
-	 * @param \OCP\IL10N	$l			The locale to use
-	 * @return string Formatted date and time string
-	 */
-	protected function format($timestamp, $type, $format, \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
-		$l = $this->getLocale($l);
-		$timeZone = $this->getTimeZone($timeZone);
-		$timestamp = $this->getDateTime($timestamp, $timeZone);
+    /**
+     * Formats the date and time of the given timestamp
+     *
+     * @param int|\DateTime $timestamp	Either a Unix timestamp or DateTime object
+     * @param string		$type		One of 'date', 'datetime' or 'time'
+     * @param string		$format		Format string
+     * @param \DateTimeZone	$timeZone	The timezone to use
+     * @param \OCP\IL10N	$l			The locale to use
+     * @return string Formatted date and time string
+     */
+    protected function format($timestamp, $type, $format, \DateTimeZone $timeZone = null, \OCP\IL10N $l = null) {
+        $l = $this->getLocale($l);
+        $timeZone = $this->getTimeZone($timeZone);
+        $timestamp = $this->getDateTime($timestamp, $timeZone);
 
-		return $l->l($type, $timestamp, array(
-			'width' => $format,
-		));
-	}
+        return $l->l($type, $timestamp, array(
+            'width' => $format,
+        ));
+    }
 }

lib/private/Preview/Provider.php

Indentation +33 added lines, -33 removed lines

@@ -28,41 +28,41 @@
 use OCP\Preview\IProvider;
 
 abstract class Provider implements IProvider {
-	private $options;
+    private $options;
 
-	/**
-	 * Constructor
-	 *
-	 * @param array $options
-	 */
-	public function __construct(array $options = []) {
-		$this->options = $options;
-	}
+    /**
+     * Constructor
+     *
+     * @param array $options
+     */
+    public function __construct(array $options = []) {
+        $this->options = $options;
+    }
 
-	/**
-	 * @return string Regex with the mimetypes that are supported by this provider
-	 */
-	abstract public function getMimeType();
+    /**
+     * @return string Regex with the mimetypes that are supported by this provider
+     */
+    abstract public function getMimeType();
 
-	/**
-	 * Check if a preview can be generated for $path
-	 *
-	 * @param \OCP\Files\FileInfo $file
-	 * @return bool
-	 */
-	public function isAvailable(\OCP\Files\FileInfo $file) {
-		return true;
-	}
+    /**
+     * Check if a preview can be generated for $path
+     *
+     * @param \OCP\Files\FileInfo $file
+     * @return bool
+     */
+    public function isAvailable(\OCP\Files\FileInfo $file) {
+        return true;
+    }
 
-	/**
-	 * Generates thumbnail which fits in $maxX and $maxY and keeps the aspect ratio, for file at path $path
-	 *
-	 * @param string $path Path of file
-	 * @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 bool $scalingup Disable/Enable upscaling of previews
-	 * @param \OC\Files\View $fileview fileview object of user folder
-	 * @return bool|\OCP\IImage false if no preview was generated
-	 */
-	abstract public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview);
+    /**
+     * Generates thumbnail which fits in $maxX and $maxY and keeps the aspect ratio, for file at path $path
+     *
+     * @param string $path Path of file
+     * @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 bool $scalingup Disable/Enable upscaling of previews
+     * @param \OC\Files\View $fileview fileview object of user folder
+     * @return bool|\OCP\IImage false if no preview was generated
+     */
+    abstract public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview);
 }

lib/private/Preview/Movie.php

Spacing +7 added lines, -7 removed lines

@@ -84,15 +84,15 @@
 		$tmpPath = \OC::$server->getTempManager()->getTemporaryFile();
 
 		if (self::$avconvBinary) {
-			$cmd = self::$avconvBinary . ' -y -ss ' . escapeshellarg($second) .
-				' -i ' . escapeshellarg($absPath) .
-				' -an -f mjpeg -vframes 1 -vsync 1 ' . escapeshellarg($tmpPath) .
+			$cmd = self::$avconvBinary.' -y -ss '.escapeshellarg($second).
+				' -i '.escapeshellarg($absPath).
+				' -an -f mjpeg -vframes 1 -vsync 1 '.escapeshellarg($tmpPath).
 				' > /dev/null 2>&1';
 		} else {
-			$cmd = self::$ffmpegBinary . ' -y -ss ' . escapeshellarg($second) .
-				' -i ' . escapeshellarg($absPath) .
-				' -f mjpeg -vframes 1' .
-				' ' . escapeshellarg($tmpPath) .
+			$cmd = self::$ffmpegBinary.' -y -ss '.escapeshellarg($second).
+				' -i '.escapeshellarg($absPath).
+				' -f mjpeg -vframes 1'.
+				' '.escapeshellarg($tmpPath).
 				' > /dev/null 2>&1';
 		}
 

Indentation +58 added lines, -58 removed lines

@@ -29,73 +29,73 @@
 use OCP\IImage;
 
 class Movie extends ProviderV2 {
-	public static $avconvBinary;
-	public static $ffmpegBinary;
+    public static $avconvBinary;
+    public static $ffmpegBinary;
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/video\/.*/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/video\/.*/';
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		// TODO: use proc_open() and stream the source file ?
+    /**
+     * {@inheritDoc}
+     */
+    public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+        // TODO: use proc_open() and stream the source file ?
 
-		$absPath = $this->getLocalFile($file, 5242880); // only use the first 5MB
+        $absPath = $this->getLocalFile($file, 5242880); // only use the first 5MB
 
-		$result = $this->generateThumbNail($maxX, $maxY, $absPath, 5);
-		if ($result === false) {
-			$result = $this->generateThumbNail($maxX, $maxY, $absPath, 1);
-			if ($result === false) {
-				$result = $this->generateThumbNail($maxX, $maxY, $absPath, 0);
-			}
-		}
+        $result = $this->generateThumbNail($maxX, $maxY, $absPath, 5);
+        if ($result === false) {
+            $result = $this->generateThumbNail($maxX, $maxY, $absPath, 1);
+            if ($result === false) {
+                $result = $this->generateThumbNail($maxX, $maxY, $absPath, 0);
+            }
+        }
 
-		$this->cleanTmpFiles();
+        $this->cleanTmpFiles();
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * @param int $maxX
-	 * @param int $maxY
-	 * @param string $absPath
-	 * @param int $second
-	 * @return null|\OCP\IImage
-	 */
-	private function generateThumbNail($maxX, $maxY, $absPath, $second): ?IImage {
-		$tmpPath = \OC::$server->getTempManager()->getTemporaryFile();
+    /**
+     * @param int $maxX
+     * @param int $maxY
+     * @param string $absPath
+     * @param int $second
+     * @return null|\OCP\IImage
+     */
+    private function generateThumbNail($maxX, $maxY, $absPath, $second): ?IImage {
+        $tmpPath = \OC::$server->getTempManager()->getTemporaryFile();
 
-		if (self::$avconvBinary) {
-			$cmd = self::$avconvBinary . ' -y -ss ' . escapeshellarg($second) .
-				' -i ' . escapeshellarg($absPath) .
-				' -an -f mjpeg -vframes 1 -vsync 1 ' . escapeshellarg($tmpPath) .
-				' > /dev/null 2>&1';
-		} else {
-			$cmd = self::$ffmpegBinary . ' -y -ss ' . escapeshellarg($second) .
-				' -i ' . escapeshellarg($absPath) .
-				' -f mjpeg -vframes 1' .
-				' ' . escapeshellarg($tmpPath) .
-				' > /dev/null 2>&1';
-		}
+        if (self::$avconvBinary) {
+            $cmd = self::$avconvBinary . ' -y -ss ' . escapeshellarg($second) .
+                ' -i ' . escapeshellarg($absPath) .
+                ' -an -f mjpeg -vframes 1 -vsync 1 ' . escapeshellarg($tmpPath) .
+                ' > /dev/null 2>&1';
+        } else {
+            $cmd = self::$ffmpegBinary . ' -y -ss ' . escapeshellarg($second) .
+                ' -i ' . escapeshellarg($absPath) .
+                ' -f mjpeg -vframes 1' .
+                ' ' . escapeshellarg($tmpPath) .
+                ' > /dev/null 2>&1';
+        }
 
-		exec($cmd, $output, $returnCode);
+        exec($cmd, $output, $returnCode);
 
-		if ($returnCode === 0) {
-			$image = new \OC_Image();
-			$image->loadFromFile($tmpPath);
-			unlink($tmpPath);
-			if ($image->valid()) {
-				$image->scaleDownToFit($maxX, $maxY);
+        if ($returnCode === 0) {
+            $image = new \OC_Image();
+            $image->loadFromFile($tmpPath);
+            unlink($tmpPath);
+            if ($image->valid()) {
+                $image->scaleDownToFit($maxX, $maxY);
 
-				return $image;
-			}
-		}
-		unlink($tmpPath);
-		return null;
-	}
+                return $image;
+            }
+        }
+        unlink($tmpPath);
+        return null;
+    }
 }

lib/private/Share20/Hooks.php

Indentation +9 added lines, -9 removed lines

@@ -22,15 +22,15 @@
 namespace OC\Share20;
 
 class Hooks {
-	public static function post_deleteUser($arguments) {
-		\OC::$server->getShareManager()->userDeleted($arguments['uid']);
-	}
+    public static function post_deleteUser($arguments) {
+        \OC::$server->getShareManager()->userDeleted($arguments['uid']);
+    }
 
-	public static function post_deleteGroup($arguments) {
-		\OC::$server->getShareManager()->groupDeleted($arguments['gid']);
-	}
+    public static function post_deleteGroup($arguments) {
+        \OC::$server->getShareManager()->groupDeleted($arguments['gid']);
+    }
 
-	public static function post_removeFromGroup($arguments) {
-		\OC::$server->getShareManager()->userDeletedFromGroup($arguments['uid'], $arguments['gid']);
-	}
+    public static function post_removeFromGroup($arguments) {
+        \OC::$server->getShareManager()->userDeletedFromGroup($arguments['uid'], $arguments['gid']);
+    }
 }

lib/private/Share20/Share.php

Spacing +6 added lines, -6 removed lines

@@ -86,10 +86,10 @@ 
 	 */
 	public function setId($id) {
 		if (is_int($id)) {
-			$id = (string)$id;
+			$id = (string) $id;
 		}
 
-		if(!is_string($id)) {
+		if (!is_string($id)) {
 			throw new \InvalidArgumentException('String expected.');
 		}
 
@@ -115,14 +115,14 @@ 
 		if ($this->providerId === null || $this->id === null) {
 			throw new \UnexpectedValueException;
 		}
-		return $this->providerId . ':' . $this->id;
+		return $this->providerId.':'.$this->id;
 	}
 
 	/**
 	 * @inheritdoc
 	 */
 	public function setProviderId($id) {
-		if(!is_string($id)) {
+		if (!is_string($id)) {
 			throw new \InvalidArgumentException('String expected.');
 		}
 
@@ -156,7 +156,7 @@ 
 
 			// for federated shares the owner can be a remote user, in this
 			// case we use the initiator
-			if($this->userManager->userExists($this->shareOwner)) {
+			if ($this->userManager->userExists($this->shareOwner)) {
 				$userFolder = $this->rootFolder->getUserFolder($this->shareOwner);
 			} else {
 				$userFolder = $this->rootFolder->getUserFolder($this->sharedBy);
@@ -164,7 +164,7 @@ 
 
 			$nodes = $userFolder->getById($this->fileId);
 			if (empty($nodes)) {
-				throw new NotFoundException('Node for share not found, fileid: ' . $this->fileId);
+				throw new NotFoundException('Node for share not found, fileid: '.$this->fileId);
 			}
 
 			$this->node = $nodes[0];

Indentation +518 added lines, -518 removed lines

@@ -34,522 +34,522 @@
 
 class Share implements \OCP\Share\IShare {
 
-	/** @var string */
-	private $id;
-	/** @var string */
-	private $providerId;
-	/** @var Node */
-	private $node;
-	/** @var int */
-	private $fileId;
-	/** @var string */
-	private $nodeType;
-	/** @var int */
-	private $shareType;
-	/** @var string */
-	private $sharedWith;
-	/** @var string */
-	private $sharedWithDisplayName;
-	/** @var string */
-	private $sharedWithAvatar;
-	/** @var string */
-	private $sharedBy;
-	/** @var string */
-	private $shareOwner;
-	/** @var int */
-	private $permissions;
-	/** @var string */
-	private $note = '';
-	/** @var \DateTime */
-	private $expireDate;
-	/** @var string */
-	private $password;
-	/** @var bool */
-	private $sendPasswordByTalk = false;
-	/** @var string */
-	private $token;
-	/** @var int */
-	private $parent;
-	/** @var string */
-	private $target;
-	/** @var \DateTime */
-	private $shareTime;
-	/** @var bool */
-	private $mailSend;
-	/** @var string */
-	private $label = '';
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ICacheEntry|null */
-	private $nodeCacheEntry;
-
-	/** @var bool */
-	private $hideDownload = false;
-
-	public function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
-		$this->rootFolder = $rootFolder;
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setId($id) {
-		if (is_int($id)) {
-			$id = (string)$id;
-		}
-
-		if(!is_string($id)) {
-			throw new \InvalidArgumentException('String expected.');
-		}
-
-		if ($this->id !== null) {
-			throw new IllegalIDChangeException('Not allowed to assign a new internal id to a share');
-		}
-
-		$this->id = trim($id);
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getId() {
-		return $this->id;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getFullId() {
-		if ($this->providerId === null || $this->id === null) {
-			throw new \UnexpectedValueException;
-		}
-		return $this->providerId . ':' . $this->id;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setProviderId($id) {
-		if(!is_string($id)) {
-			throw new \InvalidArgumentException('String expected.');
-		}
-
-		if ($this->providerId !== null) {
-			throw new IllegalIDChangeException('Not allowed to assign a new provider id to a share');
-		}
-
-		$this->providerId = trim($id);
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setNode(Node $node) {
-		$this->fileId = null;
-		$this->nodeType = null;
-		$this->node = $node;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getNode() {
-		if ($this->node === null) {
-
-			if ($this->shareOwner === null || $this->fileId === null) {
-				throw new NotFoundException();
-			}
-
-			// for federated shares the owner can be a remote user, in this
-			// case we use the initiator
-			if($this->userManager->userExists($this->shareOwner)) {
-				$userFolder = $this->rootFolder->getUserFolder($this->shareOwner);
-			} else {
-				$userFolder = $this->rootFolder->getUserFolder($this->sharedBy);
-			}
-
-			$nodes = $userFolder->getById($this->fileId);
-			if (empty($nodes)) {
-				throw new NotFoundException('Node for share not found, fileid: ' . $this->fileId);
-			}
-
-			$this->node = $nodes[0];
-		}
-
-		return $this->node;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setNodeId($fileId) {
-		$this->node = null;
-		$this->fileId = $fileId;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getNodeId() {
-		if ($this->fileId === null) {
-			$this->fileId = $this->getNode()->getId();
-		}
-
-		return $this->fileId;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setNodeType($type) {
-		if ($type !== 'file' && $type !== 'folder') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->nodeType = $type;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getNodeType() {
-		if ($this->nodeType === null) {
-			$node = $this->getNode();
-			$this->nodeType = $node instanceof File ? 'file' : 'folder';
-		}
-
-		return $this->nodeType;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setShareType($shareType) {
-		$this->shareType = $shareType;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareType() {
-		return $this->shareType;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setSharedWith($sharedWith) {
-		if (!is_string($sharedWith)) {
-			throw new \InvalidArgumentException();
-		}
-		$this->sharedWith = $sharedWith;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWith() {
-		return $this->sharedWith;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setSharedWithDisplayName($displayName) {
-		if (!is_string($displayName)) {
-			throw new \InvalidArgumentException();
-		}
-		$this->sharedWithDisplayName = $displayName;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWithDisplayName() {
-		return $this->sharedWithDisplayName;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setSharedWithAvatar($src) {
-		if (!is_string($src)) {
-			throw new \InvalidArgumentException();
-		}
-		$this->sharedWithAvatar = $src;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedWithAvatar() {
-		return $this->sharedWithAvatar;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setPermissions($permissions) {
-		//TODO checkes
-
-		$this->permissions = $permissions;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getPermissions() {
-		return $this->permissions;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setNote($note) {
-		$this->note = $note;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getNote() {
-		if (is_string($this->note)) {
-			return $this->note;
-		}
-		return '';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setLabel($label) {
-		$this->label = $label;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getLabel() {
-		return $this->label;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setExpirationDate($expireDate) {
-		//TODO checks
-
-		$this->expireDate = $expireDate;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getExpirationDate() {
-		return $this->expireDate;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function isExpired() {
-		return $this->getExpirationDate() !== null &&
-			$this->getExpirationDate() <= new \DateTime();
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setSharedBy($sharedBy) {
-		if (!is_string($sharedBy)) {
-			throw new \InvalidArgumentException();
-		}
-		//TODO checks
-		$this->sharedBy = $sharedBy;
-
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSharedBy() {
-		//TODO check if set
-		return $this->sharedBy;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setShareOwner($shareOwner) {
-		if (!is_string($shareOwner)) {
-			throw new \InvalidArgumentException();
-		}
-		//TODO checks
-
-		$this->shareOwner = $shareOwner;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareOwner() {
-		//TODO check if set
-		return $this->shareOwner;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setPassword($password) {
-		$this->password = $password;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getPassword() {
-		return $this->password;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setSendPasswordByTalk(bool $sendPasswordByTalk) {
-		$this->sendPasswordByTalk = $sendPasswordByTalk;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getSendPasswordByTalk(): bool {
-		return $this->sendPasswordByTalk;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setToken($token) {
-		$this->token = $token;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getToken() {
-		return $this->token;
-	}
-
-	/**
-	 * Set the parent of this share
-	 *
-	 * @param int parent
-	 * @return \OCP\Share\IShare
-	 * @deprecated The new shares do not have parents. This is just here for legacy reasons.
-	 */
-	public function setParent($parent) {
-		$this->parent = $parent;
-		return $this;
-	}
-
-	/**
-	 * Get the parent of this share.
-	 *
-	 * @return int
-	 * @deprecated The new shares do not have parents. This is just here for legacy reasons.
-	 */
-	public function getParent() {
-		return $this->parent;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setTarget($target) {
-		$this->target = $target;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getTarget() {
-		return $this->target;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setShareTime(\DateTime $shareTime) {
-		$this->shareTime = $shareTime;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getShareTime() {
-		return $this->shareTime;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setMailSend($mailSend) {
-		$this->mailSend = $mailSend;
-		return $this;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getMailSend() {
-		return $this->mailSend;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setNodeCacheEntry(ICacheEntry $entry) {
-		$this->nodeCacheEntry = $entry;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getNodeCacheEntry() {
-		return $this->nodeCacheEntry;
-	}
-
-	public function setHideDownload(bool $hide): IShare {
-		$this->hideDownload = $hide;
-		return $this;
-	}
-
-	public function getHideDownload(): bool {
-		return $this->hideDownload;
-	}
+    /** @var string */
+    private $id;
+    /** @var string */
+    private $providerId;
+    /** @var Node */
+    private $node;
+    /** @var int */
+    private $fileId;
+    /** @var string */
+    private $nodeType;
+    /** @var int */
+    private $shareType;
+    /** @var string */
+    private $sharedWith;
+    /** @var string */
+    private $sharedWithDisplayName;
+    /** @var string */
+    private $sharedWithAvatar;
+    /** @var string */
+    private $sharedBy;
+    /** @var string */
+    private $shareOwner;
+    /** @var int */
+    private $permissions;
+    /** @var string */
+    private $note = '';
+    /** @var \DateTime */
+    private $expireDate;
+    /** @var string */
+    private $password;
+    /** @var bool */
+    private $sendPasswordByTalk = false;
+    /** @var string */
+    private $token;
+    /** @var int */
+    private $parent;
+    /** @var string */
+    private $target;
+    /** @var \DateTime */
+    private $shareTime;
+    /** @var bool */
+    private $mailSend;
+    /** @var string */
+    private $label = '';
+
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var ICacheEntry|null */
+    private $nodeCacheEntry;
+
+    /** @var bool */
+    private $hideDownload = false;
+
+    public function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
+        $this->rootFolder = $rootFolder;
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setId($id) {
+        if (is_int($id)) {
+            $id = (string)$id;
+        }
+
+        if(!is_string($id)) {
+            throw new \InvalidArgumentException('String expected.');
+        }
+
+        if ($this->id !== null) {
+            throw new IllegalIDChangeException('Not allowed to assign a new internal id to a share');
+        }
+
+        $this->id = trim($id);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getId() {
+        return $this->id;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFullId() {
+        if ($this->providerId === null || $this->id === null) {
+            throw new \UnexpectedValueException;
+        }
+        return $this->providerId . ':' . $this->id;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setProviderId($id) {
+        if(!is_string($id)) {
+            throw new \InvalidArgumentException('String expected.');
+        }
+
+        if ($this->providerId !== null) {
+            throw new IllegalIDChangeException('Not allowed to assign a new provider id to a share');
+        }
+
+        $this->providerId = trim($id);
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setNode(Node $node) {
+        $this->fileId = null;
+        $this->nodeType = null;
+        $this->node = $node;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNode() {
+        if ($this->node === null) {
+
+            if ($this->shareOwner === null || $this->fileId === null) {
+                throw new NotFoundException();
+            }
+
+            // for federated shares the owner can be a remote user, in this
+            // case we use the initiator
+            if($this->userManager->userExists($this->shareOwner)) {
+                $userFolder = $this->rootFolder->getUserFolder($this->shareOwner);
+            } else {
+                $userFolder = $this->rootFolder->getUserFolder($this->sharedBy);
+            }
+
+            $nodes = $userFolder->getById($this->fileId);
+            if (empty($nodes)) {
+                throw new NotFoundException('Node for share not found, fileid: ' . $this->fileId);
+            }
+
+            $this->node = $nodes[0];
+        }
+
+        return $this->node;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setNodeId($fileId) {
+        $this->node = null;
+        $this->fileId = $fileId;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNodeId() {
+        if ($this->fileId === null) {
+            $this->fileId = $this->getNode()->getId();
+        }
+
+        return $this->fileId;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setNodeType($type) {
+        if ($type !== 'file' && $type !== 'folder') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->nodeType = $type;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNodeType() {
+        if ($this->nodeType === null) {
+            $node = $this->getNode();
+            $this->nodeType = $node instanceof File ? 'file' : 'folder';
+        }
+
+        return $this->nodeType;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setShareType($shareType) {
+        $this->shareType = $shareType;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareType() {
+        return $this->shareType;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSharedWith($sharedWith) {
+        if (!is_string($sharedWith)) {
+            throw new \InvalidArgumentException();
+        }
+        $this->sharedWith = $sharedWith;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWith() {
+        return $this->sharedWith;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSharedWithDisplayName($displayName) {
+        if (!is_string($displayName)) {
+            throw new \InvalidArgumentException();
+        }
+        $this->sharedWithDisplayName = $displayName;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWithDisplayName() {
+        return $this->sharedWithDisplayName;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSharedWithAvatar($src) {
+        if (!is_string($src)) {
+            throw new \InvalidArgumentException();
+        }
+        $this->sharedWithAvatar = $src;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedWithAvatar() {
+        return $this->sharedWithAvatar;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setPermissions($permissions) {
+        //TODO checkes
+
+        $this->permissions = $permissions;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPermissions() {
+        return $this->permissions;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setNote($note) {
+        $this->note = $note;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNote() {
+        if (is_string($this->note)) {
+            return $this->note;
+        }
+        return '';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setLabel($label) {
+        $this->label = $label;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getLabel() {
+        return $this->label;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setExpirationDate($expireDate) {
+        //TODO checks
+
+        $this->expireDate = $expireDate;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getExpirationDate() {
+        return $this->expireDate;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isExpired() {
+        return $this->getExpirationDate() !== null &&
+            $this->getExpirationDate() <= new \DateTime();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSharedBy($sharedBy) {
+        if (!is_string($sharedBy)) {
+            throw new \InvalidArgumentException();
+        }
+        //TODO checks
+        $this->sharedBy = $sharedBy;
+
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSharedBy() {
+        //TODO check if set
+        return $this->sharedBy;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setShareOwner($shareOwner) {
+        if (!is_string($shareOwner)) {
+            throw new \InvalidArgumentException();
+        }
+        //TODO checks
+
+        $this->shareOwner = $shareOwner;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareOwner() {
+        //TODO check if set
+        return $this->shareOwner;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setPassword($password) {
+        $this->password = $password;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPassword() {
+        return $this->password;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setSendPasswordByTalk(bool $sendPasswordByTalk) {
+        $this->sendPasswordByTalk = $sendPasswordByTalk;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSendPasswordByTalk(): bool {
+        return $this->sendPasswordByTalk;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setToken($token) {
+        $this->token = $token;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getToken() {
+        return $this->token;
+    }
+
+    /**
+     * Set the parent of this share
+     *
+     * @param int parent
+     * @return \OCP\Share\IShare
+     * @deprecated The new shares do not have parents. This is just here for legacy reasons.
+     */
+    public function setParent($parent) {
+        $this->parent = $parent;
+        return $this;
+    }
+
+    /**
+     * Get the parent of this share.
+     *
+     * @return int
+     * @deprecated The new shares do not have parents. This is just here for legacy reasons.
+     */
+    public function getParent() {
+        return $this->parent;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setTarget($target) {
+        $this->target = $target;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getTarget() {
+        return $this->target;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setShareTime(\DateTime $shareTime) {
+        $this->shareTime = $shareTime;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShareTime() {
+        return $this->shareTime;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setMailSend($mailSend) {
+        $this->mailSend = $mailSend;
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMailSend() {
+        return $this->mailSend;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setNodeCacheEntry(ICacheEntry $entry) {
+        $this->nodeCacheEntry = $entry;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getNodeCacheEntry() {
+        return $this->nodeCacheEntry;
+    }
+
+    public function setHideDownload(bool $hide): IShare {
+        $this->hideDownload = $hide;
+        return $this;
+    }
+
+    public function getHideDownload(): bool {
+        return $this->hideDownload;
+    }
 }

lib/private/Setup/AbstractDatabase.php

Spacing +4 added lines, -4 removed lines

@@ -68,14 +68,14 @@
 
 	public function validate($config) {
 		$errors = array();
-		if(empty($config['dbuser']) && empty($config['dbname'])) {
+		if (empty($config['dbuser']) && empty($config['dbname'])) {
 			$errors[] = $this->trans->t("%s enter the database username and name.", array($this->dbprettyname));
-		} else if(empty($config['dbuser'])) {
+		} else if (empty($config['dbuser'])) {
 			$errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname));
-		} else if(empty($config['dbname'])) {
+		} else if (empty($config['dbname'])) {
 			$errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname));
 		}
-		if(substr_count($config['dbname'], '.') >= 1) {
+		if (substr_count($config['dbname'], '.') >= 1) {
 			$errors[] = $this->trans->t("%s you may not use dots in the database name", array($this->dbprettyname));
 		}
 		return $errors;

Indentation +104 added lines, -104 removed lines

@@ -35,118 +35,118 @@
 
 abstract class AbstractDatabase {
 
-	/** @var IL10N */
-	protected $trans;
-	/** @var string */
-	protected $dbUser;
-	/** @var string */
-	protected $dbPassword;
-	/** @var string */
-	protected $dbName;
-	/** @var string */
-	protected $dbHost;
-	/** @var string */
-	protected $dbPort;
-	/** @var string */
-	protected $tablePrefix;
-	/** @var SystemConfig */
-	protected $config;
-	/** @var ILogger */
-	protected $logger;
-	/** @var ISecureRandom */
-	protected $random;
+    /** @var IL10N */
+    protected $trans;
+    /** @var string */
+    protected $dbUser;
+    /** @var string */
+    protected $dbPassword;
+    /** @var string */
+    protected $dbName;
+    /** @var string */
+    protected $dbHost;
+    /** @var string */
+    protected $dbPort;
+    /** @var string */
+    protected $tablePrefix;
+    /** @var SystemConfig */
+    protected $config;
+    /** @var ILogger */
+    protected $logger;
+    /** @var ISecureRandom */
+    protected $random;
 
-	public function __construct(IL10N $trans, SystemConfig $config, ILogger $logger, ISecureRandom $random) {
-		$this->trans = $trans;
-		$this->config = $config;
-		$this->logger = $logger;
-		$this->random = $random;
-	}
+    public function __construct(IL10N $trans, SystemConfig $config, ILogger $logger, ISecureRandom $random) {
+        $this->trans = $trans;
+        $this->config = $config;
+        $this->logger = $logger;
+        $this->random = $random;
+    }
 
-	public function validate($config) {
-		$errors = array();
-		if(empty($config['dbuser']) && empty($config['dbname'])) {
-			$errors[] = $this->trans->t("%s enter the database username and name.", array($this->dbprettyname));
-		} else if(empty($config['dbuser'])) {
-			$errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname));
-		} else if(empty($config['dbname'])) {
-			$errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname));
-		}
-		if(substr_count($config['dbname'], '.') >= 1) {
-			$errors[] = $this->trans->t("%s you may not use dots in the database name", array($this->dbprettyname));
-		}
-		return $errors;
-	}
+    public function validate($config) {
+        $errors = array();
+        if(empty($config['dbuser']) && empty($config['dbname'])) {
+            $errors[] = $this->trans->t("%s enter the database username and name.", array($this->dbprettyname));
+        } else if(empty($config['dbuser'])) {
+            $errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname));
+        } else if(empty($config['dbname'])) {
+            $errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname));
+        }
+        if(substr_count($config['dbname'], '.') >= 1) {
+            $errors[] = $this->trans->t("%s you may not use dots in the database name", array($this->dbprettyname));
+        }
+        return $errors;
+    }
 
-	public function initialize($config) {
-		$dbUser = $config['dbuser'];
-		$dbPass = $config['dbpass'];
-		$dbName = $config['dbname'];
-		$dbHost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost';
-		$dbPort = !empty($config['dbport']) ? $config['dbport'] : '';
-		$dbTablePrefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_';
+    public function initialize($config) {
+        $dbUser = $config['dbuser'];
+        $dbPass = $config['dbpass'];
+        $dbName = $config['dbname'];
+        $dbHost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost';
+        $dbPort = !empty($config['dbport']) ? $config['dbport'] : '';
+        $dbTablePrefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_';
 
-		$this->config->setValues([
-			'dbname'		=> $dbName,
-			'dbhost'		=> $dbHost,
-			'dbport' => $dbPort,
-			'dbtableprefix'	=> $dbTablePrefix,
-		]);
+        $this->config->setValues([
+            'dbname'		=> $dbName,
+            'dbhost'		=> $dbHost,
+            'dbport' => $dbPort,
+            'dbtableprefix'	=> $dbTablePrefix,
+        ]);
 
-		$this->dbUser = $dbUser;
-		$this->dbPassword = $dbPass;
-		$this->dbName = $dbName;
-		$this->dbHost = $dbHost;
-		$this->dbPort = $dbPort;
-		$this->tablePrefix = $dbTablePrefix;
-	}
+        $this->dbUser = $dbUser;
+        $this->dbPassword = $dbPass;
+        $this->dbName = $dbName;
+        $this->dbHost = $dbHost;
+        $this->dbPort = $dbPort;
+        $this->tablePrefix = $dbTablePrefix;
+    }
 
-	/**
-	 * @param array $configOverwrite
-	 * @return \OC\DB\Connection
-	 */
-	protected function connect(array $configOverwrite = []) {
-		$connectionParams = array(
-			'host' => $this->dbHost,
-			'user' => $this->dbUser,
-			'password' => $this->dbPassword,
-			'tablePrefix' => $this->tablePrefix,
-			'dbname' => $this->dbName
-		);
+    /**
+     * @param array $configOverwrite
+     * @return \OC\DB\Connection
+     */
+    protected function connect(array $configOverwrite = []) {
+        $connectionParams = array(
+            'host' => $this->dbHost,
+            'user' => $this->dbUser,
+            'password' => $this->dbPassword,
+            'tablePrefix' => $this->tablePrefix,
+            'dbname' => $this->dbName
+        );
 
-		// adding port support through installer
-		if (!empty($this->dbPort)) {
-			if (ctype_digit($this->dbPort)) {
-				$connectionParams['port'] = $this->dbPort;
-			} else {
-				$connectionParams['unix_socket'] = $this->dbPort;
-			}
-		} else if (strpos($this->dbHost, ':')) {
-			// Host variable may carry a port or socket.
-			list($host, $portOrSocket) = explode(':', $this->dbHost, 2);
-			if (ctype_digit($portOrSocket)) {
-				$connectionParams['port'] = $portOrSocket;
-			} else {
-				$connectionParams['unix_socket'] = $portOrSocket;
-			}
-			$connectionParams['host'] = $host;
-		}
+        // adding port support through installer
+        if (!empty($this->dbPort)) {
+            if (ctype_digit($this->dbPort)) {
+                $connectionParams['port'] = $this->dbPort;
+            } else {
+                $connectionParams['unix_socket'] = $this->dbPort;
+            }
+        } else if (strpos($this->dbHost, ':')) {
+            // Host variable may carry a port or socket.
+            list($host, $portOrSocket) = explode(':', $this->dbHost, 2);
+            if (ctype_digit($portOrSocket)) {
+                $connectionParams['port'] = $portOrSocket;
+            } else {
+                $connectionParams['unix_socket'] = $portOrSocket;
+            }
+            $connectionParams['host'] = $host;
+        }
 
-		$connectionParams = array_merge($connectionParams, $configOverwrite);
-		$cf = new ConnectionFactory($this->config);
-		return $cf->getConnection($this->config->getValue('dbtype', 'sqlite'), $connectionParams);
-	}
+        $connectionParams = array_merge($connectionParams, $configOverwrite);
+        $cf = new ConnectionFactory($this->config);
+        return $cf->getConnection($this->config->getValue('dbtype', 'sqlite'), $connectionParams);
+    }
 
-	/**
-	 * @param string $userName
-	 */
-	abstract public function setupDatabase($userName);
+    /**
+     * @param string $userName
+     */
+    abstract public function setupDatabase($userName);
 
-	public function runMigrations() {
-		if (!is_dir(\OC::$SERVERROOT."/core/Migrations")) {
-			return;
-		}
-		$ms = new MigrationService('core', \OC::$server->getDatabaseConnection());
-		$ms->migrate();
-	}
+    public function runMigrations() {
+        if (!is_dir(\OC::$SERVERROOT."/core/Migrations")) {
+            return;
+        }
+        $ms = new MigrationService('core', \OC::$server->getDatabaseConnection());
+        $ms->migrate();
+    }
 }

lib/private/PreviewManager.php

Spacing +2 added lines, -2 removed lines

@@ -244,7 +244,7 @@ 
 		}
 
 		$mount = $file->getMountPoint();
-		if ($mount and !$mount->getOption('previews', true)){
+		if ($mount and !$mount->getOption('previews', true)) {
 			return false;
 		}
 
@@ -330,7 +330,7 @@ 
 	 */
 	protected function registerCoreProvider($class, $mimeType, $options = []) {
 		if (in_array(trim($class, '\\'), $this->getEnabledDefaultProvider())) {
-			$this->registerProvider($mimeType, function () use ($class, $options) {
+			$this->registerProvider($mimeType, function() use ($class, $options) {
 				return new $class($options);
 			});
 		}

Indentation +387 added lines, -387 removed lines

@@ -39,396 +39,396 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 class PreviewManager implements IPreview {
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/** @var IRootFolder */
-	protected $rootFolder;
+    /** @var IRootFolder */
+    protected $rootFolder;
 
-	/** @var IAppData */
-	protected $appData;
+    /** @var IAppData */
+    protected $appData;
 
-	/** @var EventDispatcherInterface */
-	protected $eventDispatcher;
+    /** @var EventDispatcherInterface */
+    protected $eventDispatcher;
 
-	/** @var Generator */
-	private $generator;
+    /** @var Generator */
+    private $generator;
 	
-	/** @var GeneratorHelper */
-	private $helper;
-
-	/** @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,
-								GeneratorHelper $helper,
-								$userId) {
-		$this->config = $config;
-		$this->rootFolder = $rootFolder;
-		$this->appData = $appData;
-		$this->eventDispatcher = $eventDispatcher;
-		$this->helper = $helper;
-		$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 or \OCP\Preview\IProviderV2
-	 *
-	 * @param string $mimeTypeRegex Regex with the mime types that are supported by this provider
-	 * @param \Closure $callable
-	 * @return void
-	 */
-	public function registerProvider($mimeTypeRegex, \Closure $callable) {
-		if (!$this->config->getSystemValue('enable_previews', true)) {
-			return;
-		}
-
-		if (!isset($this->providers[$mimeTypeRegex])) {
-			$this->providers[$mimeTypeRegex] = [];
-		}
-		$this->providers[$mimeTypeRegex][] = $callable;
-		$this->providerListDirty = true;
-	}
-
-	/**
-	 * Get all providers
-	 * @return array
-	 */
-	public function getProviders() {
-		if (!$this->config->getSystemValue('enable_previews', true)) {
-			return [];
-		}
-
-		$this->registerCoreProviders();
-		if ($this->providerListDirty) {
-			$keys = array_map('strlen', array_keys($this->providers));
-			array_multisort($keys, SORT_DESC, $this->providers);
-			$this->providerListDirty = false;
-		}
-
-		return $this->providers;
-	}
-
-	/**
-	 * Does the manager have any providers
-	 * @return bool
-	 */
-	public function hasProviders() {
-		$this->registerCoreProviders();
-		return !empty($this->providers);
-	}
-
-	/**
-	 * return a preview of a file
-	 *
-	 * @param string $file The path to the file where you want a thumbnail from
-	 * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
-	 * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
-	 * @param boolean $scaleUp Scale smaller images up to the thumbnail size or not. Might look ugly
-	 * @return \OCP\IImage
-	 * @deprecated 11 Use getPreview
-	 */
-	public function createPreview($file, $maxX = 100, $maxY = 75, $scaleUp = false) {
-		try {
-			$userRoot = $this->rootFolder->getUserFolder($this->userId)->getParent();
-			$node = $userRoot->get($file);
-			if (!($file instanceof File)) {
-				throw new NotFoundException();
-			}
-
-			$preview = $this->getPreview($node, $maxX, $maxY);
-		} catch (\Exception $e) {
-			return new \OC_Image();
-		}
-
-		$previewImage = new \OC_Image();
-		$previewImage->loadFromData($preview->getContent());
-		return $previewImage;
-	}
-
-	/**
-	 * Returns a preview of a file
-	 *
-	 * The cache is searched first and if nothing usable was found then a preview is
-	 * generated by one of the providers
-	 *
-	 * @param File $file
-	 * @param int $width
-	 * @param int $height
-	 * @param bool $crop
-	 * @param string $mode
-	 * @param string $mimeType
-	 * @return ISimpleFile
-	 * @throws NotFoundException
-	 * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
-	 * @since 11.0.0 - \InvalidArgumentException was added in 12.0.0
-	 */
-	public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL, $mimeType = null) {
-		if ($this->generator === null) {
-			$this->generator = new Generator(
-				$this->config,
-				$this,
-				$this->appData,
-				new GeneratorHelper(
-					$this->rootFolder,
-					$this->config
-				),
-				$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 $providerClosure) {
-					$provider = $this->helper->getProvider($providerClosure);
-					if (!($provider instanceof IProviderV2)) {
-						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\HEIC
-	 *  - 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 = [
-			Preview\PNG::class,
-			Preview\JPEG::class,
-			Preview\GIF::class,
-			Preview\BMP::class,
-			Preview\HEIC::class,
-			Preview\XBitmap::class
-		];
-
-		$this->defaultProviders = $this->config->getSystemValue('enabledPreviewProviders', array_merge([
-			Preview\MarkDown::class,
-			Preview\MP3::class,
-			Preview\TXT::class,
-		], $imageProviders));
-
-		if (in_array(Preview\Image::class, $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(Preview\TXT::class, '/text\/plain/');
-		$this->registerCoreProvider(Preview\MarkDown::class, '/text\/(x-)?markdown/');
-		$this->registerCoreProvider(Preview\PNG::class, '/image\/png/');
-		$this->registerCoreProvider(Preview\JPEG::class, '/image\/jpeg/');
-		$this->registerCoreProvider(Preview\GIF::class, '/image\/gif/');
-		$this->registerCoreProvider(Preview\BMP::class, '/image\/bmp/');
-		$this->registerCoreProvider(Preview\XBitmap::class, '/image\/x-xbitmap/');
-		$this->registerCoreProvider(Preview\MP3::class, '/audio\/mpeg/');
-
-		// SVG, Office and Bitmap require imagick
-		if (extension_loaded('imagick')) {
-			$checkImagick = new \Imagick();
-
-			$imagickProviders = [
-				'SVG'	=> ['mimetype' => '/image\/svg\+xml/', 'class' => Preview\SVG::class],
-				'TIFF'	=> ['mimetype' => '/image\/tiff/', 'class' => Preview\TIFF::class],
-				'PDF'	=> ['mimetype' => '/application\/pdf/', 'class' => Preview\PDF::class],
-				'AI'	=> ['mimetype' => '/application\/illustrator/', 'class' => Preview\Illustrator::class],
-				'PSD'	=> ['mimetype' => '/application\/x-photoshop/', 'class' => Preview\Photoshop::class],
-				'EPS'	=> ['mimetype' => '/application\/postscript/', 'class' => Preview\Postscript::class],
-				'TTF'	=> ['mimetype' => '/application\/(?:font-sfnt|x-font$)/', 'class' => Preview\Font::class],
-				'HEIC'  => ['mimetype' => '/image\/hei(f|c)/', 'class' => Preview\HEIC::class],
-			];
-
-			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(Preview\MSOfficeDoc::class, '/application\/msword/');
-						$this->registerCoreProvider(Preview\MSOffice2003::class, '/application\/vnd.ms-.*/');
-						$this->registerCoreProvider(Preview\MSOffice2007::class, '/application\/vnd.openxmlformats-officedocument.*/');
-						$this->registerCoreProvider(Preview\OpenDocument::class, '/application\/vnd.oasis.opendocument.*/');
-						$this->registerCoreProvider(Preview\StarOffice::class, '/application\/vnd.sun.xml.*/');
-					}
-				}
-			}
-		}
-
-		// Video requires avconv or ffmpeg
-		if (in_array(Preview\Movie::class, $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(Preview\Movie::class, '/video\/.*/');
-			}
-		}
-	}
+    /** @var GeneratorHelper */
+    private $helper;
+
+    /** @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,
+                                GeneratorHelper $helper,
+                                $userId) {
+        $this->config = $config;
+        $this->rootFolder = $rootFolder;
+        $this->appData = $appData;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->helper = $helper;
+        $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 or \OCP\Preview\IProviderV2
+     *
+     * @param string $mimeTypeRegex Regex with the mime types that are supported by this provider
+     * @param \Closure $callable
+     * @return void
+     */
+    public function registerProvider($mimeTypeRegex, \Closure $callable) {
+        if (!$this->config->getSystemValue('enable_previews', true)) {
+            return;
+        }
+
+        if (!isset($this->providers[$mimeTypeRegex])) {
+            $this->providers[$mimeTypeRegex] = [];
+        }
+        $this->providers[$mimeTypeRegex][] = $callable;
+        $this->providerListDirty = true;
+    }
+
+    /**
+     * Get all providers
+     * @return array
+     */
+    public function getProviders() {
+        if (!$this->config->getSystemValue('enable_previews', true)) {
+            return [];
+        }
+
+        $this->registerCoreProviders();
+        if ($this->providerListDirty) {
+            $keys = array_map('strlen', array_keys($this->providers));
+            array_multisort($keys, SORT_DESC, $this->providers);
+            $this->providerListDirty = false;
+        }
+
+        return $this->providers;
+    }
+
+    /**
+     * Does the manager have any providers
+     * @return bool
+     */
+    public function hasProviders() {
+        $this->registerCoreProviders();
+        return !empty($this->providers);
+    }
+
+    /**
+     * return a preview of a file
+     *
+     * @param string $file The path to the file where you want a thumbnail from
+     * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
+     * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
+     * @param boolean $scaleUp Scale smaller images up to the thumbnail size or not. Might look ugly
+     * @return \OCP\IImage
+     * @deprecated 11 Use getPreview
+     */
+    public function createPreview($file, $maxX = 100, $maxY = 75, $scaleUp = false) {
+        try {
+            $userRoot = $this->rootFolder->getUserFolder($this->userId)->getParent();
+            $node = $userRoot->get($file);
+            if (!($file instanceof File)) {
+                throw new NotFoundException();
+            }
+
+            $preview = $this->getPreview($node, $maxX, $maxY);
+        } catch (\Exception $e) {
+            return new \OC_Image();
+        }
+
+        $previewImage = new \OC_Image();
+        $previewImage->loadFromData($preview->getContent());
+        return $previewImage;
+    }
+
+    /**
+     * Returns a preview of a file
+     *
+     * The cache is searched first and if nothing usable was found then a preview is
+     * generated by one of the providers
+     *
+     * @param File $file
+     * @param int $width
+     * @param int $height
+     * @param bool $crop
+     * @param string $mode
+     * @param string $mimeType
+     * @return ISimpleFile
+     * @throws NotFoundException
+     * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
+     * @since 11.0.0 - \InvalidArgumentException was added in 12.0.0
+     */
+    public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL, $mimeType = null) {
+        if ($this->generator === null) {
+            $this->generator = new Generator(
+                $this->config,
+                $this,
+                $this->appData,
+                new GeneratorHelper(
+                    $this->rootFolder,
+                    $this->config
+                ),
+                $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 $providerClosure) {
+                    $provider = $this->helper->getProvider($providerClosure);
+                    if (!($provider instanceof IProviderV2)) {
+                        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\HEIC
+     *  - 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 = [
+            Preview\PNG::class,
+            Preview\JPEG::class,
+            Preview\GIF::class,
+            Preview\BMP::class,
+            Preview\HEIC::class,
+            Preview\XBitmap::class
+        ];
+
+        $this->defaultProviders = $this->config->getSystemValue('enabledPreviewProviders', array_merge([
+            Preview\MarkDown::class,
+            Preview\MP3::class,
+            Preview\TXT::class,
+        ], $imageProviders));
+
+        if (in_array(Preview\Image::class, $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(Preview\TXT::class, '/text\/plain/');
+        $this->registerCoreProvider(Preview\MarkDown::class, '/text\/(x-)?markdown/');
+        $this->registerCoreProvider(Preview\PNG::class, '/image\/png/');
+        $this->registerCoreProvider(Preview\JPEG::class, '/image\/jpeg/');
+        $this->registerCoreProvider(Preview\GIF::class, '/image\/gif/');
+        $this->registerCoreProvider(Preview\BMP::class, '/image\/bmp/');
+        $this->registerCoreProvider(Preview\XBitmap::class, '/image\/x-xbitmap/');
+        $this->registerCoreProvider(Preview\MP3::class, '/audio\/mpeg/');
+
+        // SVG, Office and Bitmap require imagick
+        if (extension_loaded('imagick')) {
+            $checkImagick = new \Imagick();
+
+            $imagickProviders = [
+                'SVG'	=> ['mimetype' => '/image\/svg\+xml/', 'class' => Preview\SVG::class],
+                'TIFF'	=> ['mimetype' => '/image\/tiff/', 'class' => Preview\TIFF::class],
+                'PDF'	=> ['mimetype' => '/application\/pdf/', 'class' => Preview\PDF::class],
+                'AI'	=> ['mimetype' => '/application\/illustrator/', 'class' => Preview\Illustrator::class],
+                'PSD'	=> ['mimetype' => '/application\/x-photoshop/', 'class' => Preview\Photoshop::class],
+                'EPS'	=> ['mimetype' => '/application\/postscript/', 'class' => Preview\Postscript::class],
+                'TTF'	=> ['mimetype' => '/application\/(?:font-sfnt|x-font$)/', 'class' => Preview\Font::class],
+                'HEIC'  => ['mimetype' => '/image\/hei(f|c)/', 'class' => Preview\HEIC::class],
+            ];
+
+            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(Preview\MSOfficeDoc::class, '/application\/msword/');
+                        $this->registerCoreProvider(Preview\MSOffice2003::class, '/application\/vnd.ms-.*/');
+                        $this->registerCoreProvider(Preview\MSOffice2007::class, '/application\/vnd.openxmlformats-officedocument.*/');
+                        $this->registerCoreProvider(Preview\OpenDocument::class, '/application\/vnd.oasis.opendocument.*/');
+                        $this->registerCoreProvider(Preview\StarOffice::class, '/application\/vnd.sun.xml.*/');
+                    }
+                }
+            }
+        }
+
+        // Video requires avconv or ffmpeg
+        if (in_array(Preview\Movie::class, $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(Preview\Movie::class, '/video\/.*/');
+            }
+        }
+    }
 }

lib/private/Encryption/Update.php

Spacing +7 added lines, -7 removed lines

@@ -87,7 +87,7 @@ 
 			if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
 				$path = Filesystem::getPath($params['fileSource']);
 				list($owner, $ownerPath) = $this->getOwnerPath($path);
-				$absPath = '/' . $owner . '/files/' . $ownerPath;
+				$absPath = '/'.$owner.'/files/'.$ownerPath;
 				$this->update($absPath);
 			}
 		}
@@ -103,7 +103,7 @@ 
 			if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
 				$path = Filesystem::getPath($params['fileSource']);
 				list($owner, $ownerPath) = $this->getOwnerPath($path);
-				$absPath = '/' . $owner . '/files/' . $ownerPath;
+				$absPath = '/'.$owner.'/files/'.$ownerPath;
 				$this->update($absPath);
 			}
 		}
@@ -117,7 +117,7 @@ 
 	 */
 	public function postRestore($params) {
 		if ($this->encryptionManager->isEnabled()) {
-			$path = Filesystem::normalizePath('/' . $this->uid . '/files/' . $params['filePath']);
+			$path = Filesystem::normalizePath('/'.$this->uid.'/files/'.$params['filePath']);
 			$this->update($path);
 		}
 	}
@@ -131,12 +131,12 @@ 
 	public function postRename($params) {
 		$source = $params['oldpath'];
 		$target = $params['newpath'];
-		if(
+		if (
 			$this->encryptionManager->isEnabled() &&
 			dirname($source) !== dirname($target)
 		) {
 				list($owner, $ownerPath) = $this->getOwnerPath($target);
-				$absPath = '/' . $owner . '/files/' . $ownerPath;
+				$absPath = '/'.$owner.'/files/'.$ownerPath;
 				$this->update($absPath);
 		}
 	}
@@ -151,10 +151,10 @@ 
 	protected function getOwnerPath($path) {
 		$info = Filesystem::getFileInfo($path);
 		$owner = Filesystem::getOwner($path);
-		$view = new View('/' . $owner . '/files');
+		$view = new View('/'.$owner.'/files');
 		$path = $view->getPath($info->getId());
 		if ($path === null) {
-			throw new \InvalidArgumentException('No file found for ' . $info->getId());
+			throw new \InvalidArgumentException('No file found for '.$info->getId());
 		}
 
 		return array($owner, $path);

Indentation +157 added lines, -157 removed lines

@@ -33,162 +33,162 @@
  */
 class Update {
 
-	/** @var \OC\Files\View */
-	protected $view;
-
-	/** @var \OC\Encryption\Util */
-	protected $util;
-
-	 /** @var \OC\Files\Mount\Manager */
-	protected $mountManager;
-
-	/** @var \OC\Encryption\Manager */
-	protected $encryptionManager;
-
-	/** @var string */
-	protected $uid;
-
-	/** @var \OC\Encryption\File */
-	protected $file;
-
-	/**
-	 *
-	 * @param \OC\Files\View $view
-	 * @param \OC\Encryption\Util $util
-	 * @param \OC\Files\Mount\Manager $mountManager
-	 * @param \OC\Encryption\Manager $encryptionManager
-	 * @param \OC\Encryption\File $file
-	 * @param string $uid
-	 */
-	public function __construct(
-			View $view,
-			Util $util,
-			Mount\Manager $mountManager,
-			Manager $encryptionManager,
-			File $file,
-			$uid
-		) {
-
-		$this->view = $view;
-		$this->util = $util;
-		$this->mountManager = $mountManager;
-		$this->encryptionManager = $encryptionManager;
-		$this->file = $file;
-		$this->uid = $uid;
-	}
-
-	/**
-	 * hook after file was shared
-	 *
-	 * @param array $params
-	 */
-	public function postShared($params) {
-		if ($this->encryptionManager->isEnabled()) {
-			if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
-				$path = Filesystem::getPath($params['fileSource']);
-				list($owner, $ownerPath) = $this->getOwnerPath($path);
-				$absPath = '/' . $owner . '/files/' . $ownerPath;
-				$this->update($absPath);
-			}
-		}
-	}
-
-	/**
-	 * hook after file was unshared
-	 *
-	 * @param array $params
-	 */
-	public function postUnshared($params) {
-		if ($this->encryptionManager->isEnabled()) {
-			if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
-				$path = Filesystem::getPath($params['fileSource']);
-				list($owner, $ownerPath) = $this->getOwnerPath($path);
-				$absPath = '/' . $owner . '/files/' . $ownerPath;
-				$this->update($absPath);
-			}
-		}
-	}
-
-	/**
-	 * inform encryption module that a file was restored from the trash bin,
-	 * e.g. to update the encryption keys
-	 *
-	 * @param array $params
-	 */
-	public function postRestore($params) {
-		if ($this->encryptionManager->isEnabled()) {
-			$path = Filesystem::normalizePath('/' . $this->uid . '/files/' . $params['filePath']);
-			$this->update($path);
-		}
-	}
-
-	/**
-	 * inform encryption module that a file was renamed,
-	 * e.g. to update the encryption keys
-	 *
-	 * @param array $params
-	 */
-	public function postRename($params) {
-		$source = $params['oldpath'];
-		$target = $params['newpath'];
-		if(
-			$this->encryptionManager->isEnabled() &&
-			dirname($source) !== dirname($target)
-		) {
-				list($owner, $ownerPath) = $this->getOwnerPath($target);
-				$absPath = '/' . $owner . '/files/' . $ownerPath;
-				$this->update($absPath);
-		}
-	}
-
-	/**
-	 * get owner and path relative to data/<owner>/files
-	 *
-	 * @param string $path path to file for current user
-	 * @return array ['owner' => $owner, 'path' => $path]
-	 * @throw \InvalidArgumentException
-	 */
-	protected function getOwnerPath($path) {
-		$info = Filesystem::getFileInfo($path);
-		$owner = Filesystem::getOwner($path);
-		$view = new View('/' . $owner . '/files');
-		$path = $view->getPath($info->getId());
-		if ($path === null) {
-			throw new \InvalidArgumentException('No file found for ' . $info->getId());
-		}
-
-		return array($owner, $path);
-	}
-
-	/**
-	 * notify encryption module about added/removed users from a file/folder
-	 *
-	 * @param string $path relative to data/
-	 * @throws Exceptions\ModuleDoesNotExistsException
-	 */
-	public function update($path) {
-
-		$encryptionModule = $this->encryptionManager->getEncryptionModule();
-
-		// if the encryption module doesn't encrypt the files on a per-user basis
-		// we have nothing to do here.
-		if ($encryptionModule->needDetailedAccessList() === false) {
-			return;
-		}
-
-		// if a folder was shared, get a list of all (sub-)folders
-		if ($this->view->is_dir($path)) {
-			$allFiles = $this->util->getAllFiles($path);
-		} else {
-			$allFiles = array($path);
-		}
-
-
-
-		foreach ($allFiles as $file) {
-			$usersSharing = $this->file->getAccessList($file);
-			$encryptionModule->update($file, $this->uid, $usersSharing);
-		}
-	}
+    /** @var \OC\Files\View */
+    protected $view;
+
+    /** @var \OC\Encryption\Util */
+    protected $util;
+
+        /** @var \OC\Files\Mount\Manager */
+    protected $mountManager;
+
+    /** @var \OC\Encryption\Manager */
+    protected $encryptionManager;
+
+    /** @var string */
+    protected $uid;
+
+    /** @var \OC\Encryption\File */
+    protected $file;
+
+    /**
+     *
+     * @param \OC\Files\View $view
+     * @param \OC\Encryption\Util $util
+     * @param \OC\Files\Mount\Manager $mountManager
+     * @param \OC\Encryption\Manager $encryptionManager
+     * @param \OC\Encryption\File $file
+     * @param string $uid
+     */
+    public function __construct(
+            View $view,
+            Util $util,
+            Mount\Manager $mountManager,
+            Manager $encryptionManager,
+            File $file,
+            $uid
+        ) {
+
+        $this->view = $view;
+        $this->util = $util;
+        $this->mountManager = $mountManager;
+        $this->encryptionManager = $encryptionManager;
+        $this->file = $file;
+        $this->uid = $uid;
+    }
+
+    /**
+     * hook after file was shared
+     *
+     * @param array $params
+     */
+    public function postShared($params) {
+        if ($this->encryptionManager->isEnabled()) {
+            if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
+                $path = Filesystem::getPath($params['fileSource']);
+                list($owner, $ownerPath) = $this->getOwnerPath($path);
+                $absPath = '/' . $owner . '/files/' . $ownerPath;
+                $this->update($absPath);
+            }
+        }
+    }
+
+    /**
+     * hook after file was unshared
+     *
+     * @param array $params
+     */
+    public function postUnshared($params) {
+        if ($this->encryptionManager->isEnabled()) {
+            if ($params['itemType'] === 'file' || $params['itemType'] === 'folder') {
+                $path = Filesystem::getPath($params['fileSource']);
+                list($owner, $ownerPath) = $this->getOwnerPath($path);
+                $absPath = '/' . $owner . '/files/' . $ownerPath;
+                $this->update($absPath);
+            }
+        }
+    }
+
+    /**
+     * inform encryption module that a file was restored from the trash bin,
+     * e.g. to update the encryption keys
+     *
+     * @param array $params
+     */
+    public function postRestore($params) {
+        if ($this->encryptionManager->isEnabled()) {
+            $path = Filesystem::normalizePath('/' . $this->uid . '/files/' . $params['filePath']);
+            $this->update($path);
+        }
+    }
+
+    /**
+     * inform encryption module that a file was renamed,
+     * e.g. to update the encryption keys
+     *
+     * @param array $params
+     */
+    public function postRename($params) {
+        $source = $params['oldpath'];
+        $target = $params['newpath'];
+        if(
+            $this->encryptionManager->isEnabled() &&
+            dirname($source) !== dirname($target)
+        ) {
+                list($owner, $ownerPath) = $this->getOwnerPath($target);
+                $absPath = '/' . $owner . '/files/' . $ownerPath;
+                $this->update($absPath);
+        }
+    }
+
+    /**
+     * get owner and path relative to data/<owner>/files
+     *
+     * @param string $path path to file for current user
+     * @return array ['owner' => $owner, 'path' => $path]
+     * @throw \InvalidArgumentException
+     */
+    protected function getOwnerPath($path) {
+        $info = Filesystem::getFileInfo($path);
+        $owner = Filesystem::getOwner($path);
+        $view = new View('/' . $owner . '/files');
+        $path = $view->getPath($info->getId());
+        if ($path === null) {
+            throw new \InvalidArgumentException('No file found for ' . $info->getId());
+        }
+
+        return array($owner, $path);
+    }
+
+    /**
+     * notify encryption module about added/removed users from a file/folder
+     *
+     * @param string $path relative to data/
+     * @throws Exceptions\ModuleDoesNotExistsException
+     */
+    public function update($path) {
+
+        $encryptionModule = $this->encryptionManager->getEncryptionModule();
+
+        // if the encryption module doesn't encrypt the files on a per-user basis
+        // we have nothing to do here.
+        if ($encryptionModule->needDetailedAccessList() === false) {
+            return;
+        }
+
+        // if a folder was shared, get a list of all (sub-)folders
+        if ($this->view->is_dir($path)) {
+            $allFiles = $this->util->getAllFiles($path);
+        } else {
+            $allFiles = array($path);
+        }
+
+
+
+        foreach ($allFiles as $file) {
+            $usersSharing = $this->file->getAccessList($file);
+            $encryptionModule->update($file, $this->uid, $usersSharing);
+        }
+    }
 
 }