nextcloud / server

apps/files_trashbin/lib/AppInfo/Application.php

Indentation +47 added lines, -47 removed lines

@@ -36,64 +36,64 @@
 use OCP\AppFramework\IAppContainer;
 
 class Application extends App {
-	public function __construct(array $urlParams = []) {
-		parent::__construct('files_trashbin', $urlParams);
+    public function __construct(array $urlParams = []) {
+        parent::__construct('files_trashbin', $urlParams);
 
-		$container = $this->getContainer();
-		/*
+        $container = $this->getContainer();
+        /*
 		 * Register capabilities
 		 */
-		$container->registerCapability(Capabilities::class);
+        $container->registerCapability(Capabilities::class);
 
-		/*
+        /*
 		 * Register expiration
 		 */
-		$container->registerAlias('Expiration', Expiration::class);
+        $container->registerAlias('Expiration', Expiration::class);
 
-		/*
+        /*
 		 * Register $principalBackend for the DAV collection
 		 */
-		$container->registerService('principalBackend', function () {
-			return new Principal(
-				\OC::$server->getUserManager(),
-				\OC::$server->getGroupManager(),
-				\OC::$server->getShareManager(),
-				\OC::$server->getUserSession(),
-				\OC::$server->getAppManager(),
-				\OC::$server->query(ProxyMapper::class),
-				\OC::$server->getConfig()
-			);
-		});
+        $container->registerService('principalBackend', function () {
+            return new Principal(
+                \OC::$server->getUserManager(),
+                \OC::$server->getGroupManager(),
+                \OC::$server->getShareManager(),
+                \OC::$server->getUserSession(),
+                \OC::$server->getAppManager(),
+                \OC::$server->query(ProxyMapper::class),
+                \OC::$server->getConfig()
+            );
+        });
 
-		$container->registerService(ITrashManager::class, function (IAppContainer $c) {
-			return new TrashManager();
-		});
+        $container->registerService(ITrashManager::class, function (IAppContainer $c) {
+            return new TrashManager();
+        });
 
-		$this->registerTrashBackends();
-	}
+        $this->registerTrashBackends();
+    }
 
-	public function registerTrashBackends() {
-		$server = $this->getContainer()->getServer();
-		$logger = $server->getLogger();
-		$appManager = $server->getAppManager();
-		/** @var ITrashManager $trashManager */
-		$trashManager = $this->getContainer()->getServer()->query(ITrashManager::class);
-		foreach($appManager->getInstalledApps() as $app) {
-			$appInfo = $appManager->getAppInfo($app);
-			if (isset($appInfo['trash'])) {
-				$backends = $appInfo['trash'];
-				foreach($backends as $backend) {
-					$class = $backend['@value'];
-					$for = $backend['@attributes']['for'];
+    public function registerTrashBackends() {
+        $server = $this->getContainer()->getServer();
+        $logger = $server->getLogger();
+        $appManager = $server->getAppManager();
+        /** @var ITrashManager $trashManager */
+        $trashManager = $this->getContainer()->getServer()->query(ITrashManager::class);
+        foreach($appManager->getInstalledApps() as $app) {
+            $appInfo = $appManager->getAppInfo($app);
+            if (isset($appInfo['trash'])) {
+                $backends = $appInfo['trash'];
+                foreach($backends as $backend) {
+                    $class = $backend['@value'];
+                    $for = $backend['@attributes']['for'];
 
-					try {
-						$backendObject = $server->query($class);
-						$trashManager->registerBackend($for, $backendObject);
-					} catch (\Exception $e) {
-						$logger->logException($e);
-					}
-				}
-			}
-		}
-	}
+                    try {
+                        $backendObject = $server->query($class);
+                        $trashManager->registerBackend($for, $backendObject);
+                    } catch (\Exception $e) {
+                        $logger->logException($e);
+                    }
+                }
+            }
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
 		/*
 		 * Register $principalBackend for the DAV collection
 		 */
-		$container->registerService('principalBackend', function () {
+		$container->registerService('principalBackend', function() {
 			return new Principal(
 				\OC::$server->getUserManager(),
 				\OC::$server->getGroupManager(),
@@ -65,7 +65,7 @@ 
 			);
 		});
 
-		$container->registerService(ITrashManager::class, function (IAppContainer $c) {
+		$container->registerService(ITrashManager::class, function(IAppContainer $c) {
 			return new TrashManager();
 		});
 
@@ -78,11 +78,11 @@ 
 		$appManager = $server->getAppManager();
 		/** @var ITrashManager $trashManager */
 		$trashManager = $this->getContainer()->getServer()->query(ITrashManager::class);
-		foreach($appManager->getInstalledApps() as $app) {
+		foreach ($appManager->getInstalledApps() as $app) {
 			$appInfo = $appManager->getAppInfo($app);
 			if (isset($appInfo['trash'])) {
 				$backends = $appInfo['trash'];
-				foreach($backends as $backend) {
+				foreach ($backends as $backend) {
 					$class = $backend['@value'];
 					$for = $backend['@attributes']['for'];
 

apps/files_trashbin/lib/Expiration.php

Indentation +139 added lines, -139 removed lines

@@ -31,143 +31,143 @@
 
 class Expiration {
 
-	// how long do we keep files in the trash bin if no other value is defined in the config file (unit: days)
-	const DEFAULT_RETENTION_OBLIGATION = 30;
-	const NO_OBLIGATION = -1;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/** @var string */
-	private $retentionObligation;
-
-	/** @var int */
-	private $minAge;
-
-	/** @var int */
-	private $maxAge;
-
-	/** @var bool */
-	private $canPurgeToSaveSpace;
-
-	public function __construct(IConfig $config,ITimeFactory $timeFactory) {
-		$this->timeFactory = $timeFactory;
-		$this->setRetentionObligation($config->getSystemValue('trashbin_retention_obligation', 'auto'));
-	}
-
-	public function setRetentionObligation(string $obligation) {
-		$this->retentionObligation = $obligation;
-
-		if ($this->retentionObligation !== 'disabled') {
-			$this->parseRetentionObligation();
-		}
-	}
-
-	/**
-	 * Is trashbin expiration enabled
-	 * @return bool
-	 */
-	public function isEnabled() {
-		return $this->retentionObligation !== 'disabled';
-	}
-
-	/**
-	 * Check if given timestamp in expiration range
-	 * @param int $timestamp
-	 * @param bool $quotaExceeded
-	 * @return bool
-	 */
-	public function isExpired($timestamp, $quotaExceeded = false) {
-		// No expiration if disabled
-		if (!$this->isEnabled()) {
-			return false;
-		}
-
-		// Purge to save space (if allowed)
-		if ($quotaExceeded && $this->canPurgeToSaveSpace) {
-			return true;
-		}
-
-		$time = $this->timeFactory->getTime();
-		// Never expire dates in future e.g. misconfiguration or negative time
-		// adjustment
-		if ($time<$timestamp) {
-			return false;
-		}
-
-		// Purge as too old
-		if ($this->maxAge !== self::NO_OBLIGATION) {
-			$maxTimestamp = $time - ($this->maxAge * 86400);
-			$isOlderThanMax = $timestamp < $maxTimestamp;
-		} else {
-			$isOlderThanMax = false;
-		}
-
-		if ($this->minAge !== self::NO_OBLIGATION) {
-			// older than Min obligation and we are running out of quota?
-			$minTimestamp = $time - ($this->minAge * 86400);
-			$isMinReached = ($timestamp < $minTimestamp) && $quotaExceeded;
-		} else {
-			$isMinReached = false;
-		}
-
-		return $isOlderThanMax || $isMinReached;
-	}
-
-	/**
-	 * @return bool|int
-	 */
-	public function getMaxAgeAsTimestamp() {
-		$maxAge = false;
-		if ($this->isEnabled() && $this->maxAge !== self::NO_OBLIGATION) {
-			$time = $this->timeFactory->getTime();
-			$maxAge = $time - ($this->maxAge * 86400);
-		}
-		return $maxAge;
-	}
-
-	private function parseRetentionObligation() {
-		$splitValues = explode(',', $this->retentionObligation);
-		if (!isset($splitValues[0])) {
-			$minValue = self::DEFAULT_RETENTION_OBLIGATION;
-		} else {
-			$minValue = trim($splitValues[0]);
-		}
-
-		if (!isset($splitValues[1]) && $minValue === 'auto') {
-			$maxValue = 'auto';
-		} elseif (!isset($splitValues[1])) {
-			$maxValue = self::DEFAULT_RETENTION_OBLIGATION;
-		} else {
-			$maxValue = trim($splitValues[1]);
-		}
-
-		if ($minValue === 'auto' && $maxValue === 'auto') {
-			// Default: Keep for 30 days but delete anytime if space needed
-			$this->minAge = self::DEFAULT_RETENTION_OBLIGATION;
-			$this->maxAge = self::NO_OBLIGATION;
-			$this->canPurgeToSaveSpace = true;
-		} elseif ($minValue !== 'auto' && $maxValue === 'auto') {
-			// Keep for X days but delete anytime if space needed
-			$this->minAge = (int)$minValue;
-			$this->maxAge = self::NO_OBLIGATION;
-			$this->canPurgeToSaveSpace = true;
-		} elseif ($minValue === 'auto' && $maxValue !== 'auto') {
-			// Delete anytime if space needed, Delete all older than max automatically
-			$this->minAge = self::NO_OBLIGATION;
-			$this->maxAge = (int)$maxValue;
-			$this->canPurgeToSaveSpace = true;
-		} elseif ($minValue !== 'auto' && $maxValue !== 'auto') {
-			// Delete all older than max OR older than min if space needed
-
-			// Max < Min as per https://github.com/owncloud/core/issues/16300
-			if ($maxValue < $minValue) {
-				$maxValue = $minValue;
-			}
-
-			$this->minAge = (int)$minValue;
-			$this->maxAge = (int)$maxValue;
-			$this->canPurgeToSaveSpace = false;
-		}
-	}
+    // how long do we keep files in the trash bin if no other value is defined in the config file (unit: days)
+    const DEFAULT_RETENTION_OBLIGATION = 30;
+    const NO_OBLIGATION = -1;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /** @var string */
+    private $retentionObligation;
+
+    /** @var int */
+    private $minAge;
+
+    /** @var int */
+    private $maxAge;
+
+    /** @var bool */
+    private $canPurgeToSaveSpace;
+
+    public function __construct(IConfig $config,ITimeFactory $timeFactory) {
+        $this->timeFactory = $timeFactory;
+        $this->setRetentionObligation($config->getSystemValue('trashbin_retention_obligation', 'auto'));
+    }
+
+    public function setRetentionObligation(string $obligation) {
+        $this->retentionObligation = $obligation;
+
+        if ($this->retentionObligation !== 'disabled') {
+            $this->parseRetentionObligation();
+        }
+    }
+
+    /**
+     * Is trashbin expiration enabled
+     * @return bool
+     */
+    public function isEnabled() {
+        return $this->retentionObligation !== 'disabled';
+    }
+
+    /**
+     * Check if given timestamp in expiration range
+     * @param int $timestamp
+     * @param bool $quotaExceeded
+     * @return bool
+     */
+    public function isExpired($timestamp, $quotaExceeded = false) {
+        // No expiration if disabled
+        if (!$this->isEnabled()) {
+            return false;
+        }
+
+        // Purge to save space (if allowed)
+        if ($quotaExceeded && $this->canPurgeToSaveSpace) {
+            return true;
+        }
+
+        $time = $this->timeFactory->getTime();
+        // Never expire dates in future e.g. misconfiguration or negative time
+        // adjustment
+        if ($time<$timestamp) {
+            return false;
+        }
+
+        // Purge as too old
+        if ($this->maxAge !== self::NO_OBLIGATION) {
+            $maxTimestamp = $time - ($this->maxAge * 86400);
+            $isOlderThanMax = $timestamp < $maxTimestamp;
+        } else {
+            $isOlderThanMax = false;
+        }
+
+        if ($this->minAge !== self::NO_OBLIGATION) {
+            // older than Min obligation and we are running out of quota?
+            $minTimestamp = $time - ($this->minAge * 86400);
+            $isMinReached = ($timestamp < $minTimestamp) && $quotaExceeded;
+        } else {
+            $isMinReached = false;
+        }
+
+        return $isOlderThanMax || $isMinReached;
+    }
+
+    /**
+     * @return bool|int
+     */
+    public function getMaxAgeAsTimestamp() {
+        $maxAge = false;
+        if ($this->isEnabled() && $this->maxAge !== self::NO_OBLIGATION) {
+            $time = $this->timeFactory->getTime();
+            $maxAge = $time - ($this->maxAge * 86400);
+        }
+        return $maxAge;
+    }
+
+    private function parseRetentionObligation() {
+        $splitValues = explode(',', $this->retentionObligation);
+        if (!isset($splitValues[0])) {
+            $minValue = self::DEFAULT_RETENTION_OBLIGATION;
+        } else {
+            $minValue = trim($splitValues[0]);
+        }
+
+        if (!isset($splitValues[1]) && $minValue === 'auto') {
+            $maxValue = 'auto';
+        } elseif (!isset($splitValues[1])) {
+            $maxValue = self::DEFAULT_RETENTION_OBLIGATION;
+        } else {
+            $maxValue = trim($splitValues[1]);
+        }
+
+        if ($minValue === 'auto' && $maxValue === 'auto') {
+            // Default: Keep for 30 days but delete anytime if space needed
+            $this->minAge = self::DEFAULT_RETENTION_OBLIGATION;
+            $this->maxAge = self::NO_OBLIGATION;
+            $this->canPurgeToSaveSpace = true;
+        } elseif ($minValue !== 'auto' && $maxValue === 'auto') {
+            // Keep for X days but delete anytime if space needed
+            $this->minAge = (int)$minValue;
+            $this->maxAge = self::NO_OBLIGATION;
+            $this->canPurgeToSaveSpace = true;
+        } elseif ($minValue === 'auto' && $maxValue !== 'auto') {
+            // Delete anytime if space needed, Delete all older than max automatically
+            $this->minAge = self::NO_OBLIGATION;
+            $this->maxAge = (int)$maxValue;
+            $this->canPurgeToSaveSpace = true;
+        } elseif ($minValue !== 'auto' && $maxValue !== 'auto') {
+            // Delete all older than max OR older than min if space needed
+
+            // Max < Min as per https://github.com/owncloud/core/issues/16300
+            if ($maxValue < $minValue) {
+                $maxValue = $minValue;
+            }
+
+            $this->minAge = (int)$minValue;
+            $this->maxAge = (int)$maxValue;
+            $this->canPurgeToSaveSpace = false;
+        }
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -50,7 +50,7 @@ 
 	/** @var bool */
 	private $canPurgeToSaveSpace;
 
-	public function __construct(IConfig $config,ITimeFactory $timeFactory) {
+	public function __construct(IConfig $config, ITimeFactory $timeFactory) {
 		$this->timeFactory = $timeFactory;
 		$this->setRetentionObligation($config->getSystemValue('trashbin_retention_obligation', 'auto'));
 	}
@@ -91,7 +91,7 @@ 
 		$time = $this->timeFactory->getTime();
 		// Never expire dates in future e.g. misconfiguration or negative time
 		// adjustment
-		if ($time<$timestamp) {
+		if ($time < $timestamp) {
 			return false;
 		}
 
@@ -149,13 +149,13 @@ 
 			$this->canPurgeToSaveSpace = true;
 		} elseif ($minValue !== 'auto' && $maxValue === 'auto') {
 			// Keep for X days but delete anytime if space needed
-			$this->minAge = (int)$minValue;
+			$this->minAge = (int) $minValue;
 			$this->maxAge = self::NO_OBLIGATION;
 			$this->canPurgeToSaveSpace = true;
 		} elseif ($minValue === 'auto' && $maxValue !== 'auto') {
 			// Delete anytime if space needed, Delete all older than max automatically
 			$this->minAge = self::NO_OBLIGATION;
-			$this->maxAge = (int)$maxValue;
+			$this->maxAge = (int) $maxValue;
 			$this->canPurgeToSaveSpace = true;
 		} elseif ($minValue !== 'auto' && $maxValue !== 'auto') {
 			// Delete all older than max OR older than min if space needed
@@ -165,8 +165,8 @@ 
 				$maxValue = $minValue;
 			}
 
-			$this->minAge = (int)$minValue;
-			$this->maxAge = (int)$maxValue;
+			$this->minAge = (int) $minValue;
+			$this->maxAge = (int) $maxValue;
 			$this->canPurgeToSaveSpace = false;
 		}
 	}

apps/systemtags/appinfo/app.php

Indentation +21 added lines, -21 removed lines

@@ -31,18 +31,18 @@ 
 
 $eventDispatcher = \OC::$server->getEventDispatcher();
 $eventDispatcher->addListener(
-	'OCA\Files::loadAdditionalScripts',
-	function () {
-		// FIXME: no public API for these ?
-		\OCP\Util::addScript('dist/systemtags');
-		\OCP\Util::addScript('systemtags', 'systemtags');
-	}
+    'OCA\Files::loadAdditionalScripts',
+    function () {
+        // FIXME: no public API for these ?
+        \OCP\Util::addScript('dist/systemtags');
+        \OCP\Util::addScript('systemtags', 'systemtags');
+    }
 );
 
 $managerListener = function (ManagerEvent $event) {
-	/** @var \OCA\SystemTags\Activity\Listener $listener */
-	$listener = \OC::$server->query(Listener::class);
-	$listener->event($event);
+    /** @var \OCA\SystemTags\Activity\Listener $listener */
+    $listener = \OC::$server->query(Listener::class);
+    $listener->event($event);
 };
 
 $eventDispatcher->addListener(ManagerEvent::EVENT_CREATE, $managerListener);
@@ -50,23 +50,23 @@ 
 $eventDispatcher->addListener(ManagerEvent::EVENT_UPDATE, $managerListener);
 
 $mapperListener = function (MapperEvent $event) {
-	$application = new \OCP\AppFramework\App('systemtags');
-	/** @var \OCA\SystemTags\Activity\Listener $listener */
-	$listener = \OC::$server->query(Listener::class);
-	$listener->mapperEvent($event);
+    $application = new \OCP\AppFramework\App('systemtags');
+    /** @var \OCA\SystemTags\Activity\Listener $listener */
+    $listener = \OC::$server->query(Listener::class);
+    $listener->mapperEvent($event);
 };
 
 $eventDispatcher->addListener(MapperEvent::EVENT_ASSIGN, $mapperListener);
 $eventDispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener);
 
 \OCA\Files\App::getNavigationManager()->add(function () {
-	$l = \OC::$server->getL10N('systemtags');
-	return [
-		'id' => 'systemtagsfilter',
-		'appname' => 'systemtags',
-		'script' => 'list.php',
-		'order' => 25,
-		'name' => $l->t('Tags'),
-	];
+    $l = \OC::$server->getL10N('systemtags');
+    return [
+        'id' => 'systemtagsfilter',
+        'appname' => 'systemtags',
+        'script' => 'list.php',
+        'order' => 25,
+        'name' => $l->t('Tags'),
+    ];
 });
 

Spacing +4 added lines, -4 removed lines

@@ -32,14 +32,14 @@ 
 $eventDispatcher = \OC::$server->getEventDispatcher();
 $eventDispatcher->addListener(
 	'OCA\Files::loadAdditionalScripts',
-	function () {
+	function() {
 		// FIXME: no public API for these ?
 		\OCP\Util::addScript('dist/systemtags');
 		\OCP\Util::addScript('systemtags', 'systemtags');
 	}
 );
 
-$managerListener = function (ManagerEvent $event) {
+$managerListener = function(ManagerEvent $event) {
 	/** @var \OCA\SystemTags\Activity\Listener $listener */
 	$listener = \OC::$server->query(Listener::class);
 	$listener->event($event);
@@ -49,7 +49,7 @@ 
 $eventDispatcher->addListener(ManagerEvent::EVENT_DELETE, $managerListener);
 $eventDispatcher->addListener(ManagerEvent::EVENT_UPDATE, $managerListener);
 
-$mapperListener = function (MapperEvent $event) {
+$mapperListener = function(MapperEvent $event) {
 	$application = new \OCP\AppFramework\App('systemtags');
 	/** @var \OCA\SystemTags\Activity\Listener $listener */
 	$listener = \OC::$server->query(Listener::class);
@@ -59,7 +59,7 @@ 
 $eventDispatcher->addListener(MapperEvent::EVENT_ASSIGN, $mapperListener);
 $eventDispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener);
 
-\OCA\Files\App::getNavigationManager()->add(function () {
+\OCA\Files\App::getNavigationManager()->add(function() {
 	$l = \OC::$server->getL10N('systemtags');
 	return [
 		'id' => 'systemtagsfilter',

apps/systemtags/lib/Controller/LastUsedController.php

Indentation +23 added lines, -23 removed lines

@@ -31,30 +31,30 @@
 
 class LastUsedController extends Controller {
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/** @var IUserSession */
-	protected $userSession;
+    /** @var IUserSession */
+    protected $userSession;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 * @param IUserSession $userSession
-	 */
-	public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession) {
-		parent::__construct($appName, $request);
-		$this->config = $config;
-		$this->userSession = $userSession;
-	}
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     * @param IUserSession $userSession
+     */
+    public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession) {
+        parent::__construct($appName, $request);
+        $this->config = $config;
+        $this->userSession = $userSession;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 */
-	public function getLastUsedTagIds() {
-		$lastUsed = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'systemtags', 'last_used', '[]');
-		$tagIds = json_decode($lastUsed, true);
-		return new DataResponse(array_map(function ($id) { return (string) $id; }, $tagIds));
-	}
+    /**
+     * @NoAdminRequired
+     */
+    public function getLastUsedTagIds() {
+        $lastUsed = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'systemtags', 'last_used', '[]');
+        $tagIds = json_decode($lastUsed, true);
+        return new DataResponse(array_map(function ($id) { return (string) $id; }, $tagIds));
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -55,6 +55,6 @@
 	public function getLastUsedTagIds() {
 		$lastUsed = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'systemtags', 'last_used', '[]');
 		$tagIds = json_decode($lastUsed, true);
-		return new DataResponse(array_map(function ($id) { return (string) $id; }, $tagIds));
+		return new DataResponse(array_map(function($id) { return (string) $id; }, $tagIds));
 	}
 }

apps/encryption/lib/AppInfo/Application.php

Indentation +213 added lines, -213 removed lines

@@ -50,217 +50,217 @@
 
 class Application extends \OCP\AppFramework\App {
 
-	/** @var IManager */
-	private $encryptionManager;
-	/** @var IConfig */
-	private $config;
-
-	/**
-	 * @param array $urlParams
-	 */
-	public function __construct($urlParams = []) {
-		parent::__construct('encryption', $urlParams);
-		$this->encryptionManager = \OC::$server->getEncryptionManager();
-		$this->config = \OC::$server->getConfig();
-		$this->registerServices();
-	}
-
-	public function setUp() {
-		if ($this->encryptionManager->isEnabled()) {
-			/** @var Setup $setup */
-			$setup = $this->getContainer()->query('UserSetup');
-			$setup->setupSystem();
-		}
-	}
-
-	/**
-	 * register hooks
-	 */
-	public function registerHooks() {
-		if (!$this->config->getSystemValueBool('maintenance')) {
-
-			$container = $this->getContainer();
-			$server = $container->getServer();
-			// Register our hooks and fire them.
-			$hookManager = new HookManager();
-
-			$hookManager->registerHook([
-				new UserHooks($container->query('KeyManager'),
-					$server->getUserManager(),
-					$server->getLogger(),
-					$container->query('UserSetup'),
-					$server->getUserSession(),
-					$container->query('Util'),
-					$container->query('Session'),
-					$container->query('Crypt'),
-					$container->query('Recovery'))
-			]);
-
-			$hookManager->fireHooks();
-
-		} else {
-			// Logout user if we are in maintenance to force re-login
-			$this->getContainer()->getServer()->getUserSession()->logout();
-		}
-	}
-
-	public function registerEncryptionModule() {
-		$container = $this->getContainer();
-
-
-		$this->encryptionManager->registerEncryptionModule(
-			Encryption::ID,
-			Encryption::DISPLAY_NAME,
-			function () use ($container) {
-
-			return new Encryption(
-				$container->query('Crypt'),
-				$container->query('KeyManager'),
-				$container->query('Util'),
-				$container->query('Session'),
-				$container->query('EncryptAll'),
-				$container->query('DecryptAll'),
-				$container->getServer()->getLogger(),
-				$container->getServer()->getL10N($container->getAppName())
-			);
-		});
-
-	}
-
-	public function registerServices() {
-		$container = $this->getContainer();
-
-		$container->registerService('Crypt',
-			function (IAppContainer $c) {
-				$server = $c->getServer();
-				return new Crypt($server->getLogger(),
-					$server->getUserSession(),
-					$server->getConfig(),
-					$server->getL10N($c->getAppName()));
-			});
-
-		$container->registerService('Session',
-			function (IAppContainer $c) {
-				$server = $c->getServer();
-				return new Session($server->getSession());
-			}
-		);
-
-		$container->registerService('KeyManager',
-			function (IAppContainer $c) {
-				$server = $c->getServer();
-
-				return new KeyManager($server->getEncryptionKeyStorage(),
-					$c->query('Crypt'),
-					$server->getConfig(),
-					$server->getUserSession(),
-					new Session($server->getSession()),
-					$server->getLogger(),
-					$c->query('Util')
-				);
-			});
-
-		$container->registerService('Recovery',
-			function (IAppContainer $c) {
-				$server = $c->getServer();
-
-				return new Recovery(
-					$server->getUserSession(),
-					$c->query('Crypt'),
-					$c->query('KeyManager'),
-					$server->getConfig(),
-					$server->getEncryptionFilesHelper(),
-					new View());
-			});
-
-		$container->registerService('RecoveryController', function (IAppContainer $c) {
-			$server = $c->getServer();
-			return new RecoveryController(
-				$c->getAppName(),
-				$server->getRequest(),
-				$server->getConfig(),
-				$server->getL10N($c->getAppName()),
-				$c->query('Recovery'));
-		});
-
-		$container->registerService('StatusController', function (IAppContainer $c) {
-			$server = $c->getServer();
-			return new StatusController(
-				$c->getAppName(),
-				$server->getRequest(),
-				$server->getL10N($c->getAppName()),
-				$c->query('Session'),
-				$server->getEncryptionManager()
-			);
-		});
-
-		$container->registerService('SettingsController', function (IAppContainer $c) {
-			$server = $c->getServer();
-			return new SettingsController(
-				$c->getAppName(),
-				$server->getRequest(),
-				$server->getL10N($c->getAppName()),
-				$server->getUserManager(),
-				$server->getUserSession(),
-				$c->query('KeyManager'),
-				$c->query('Crypt'),
-				$c->query('Session'),
-				$server->getSession(),
-				$c->query('Util')
-			);
-		});
-
-		$container->registerService('UserSetup',
-			function (IAppContainer $c) {
-				$server = $c->getServer();
-				return new Setup($server->getLogger(),
-					$server->getUserSession(),
-					$c->query('Crypt'),
-					$c->query('KeyManager'));
-			});
-
-		$container->registerService('Util',
-			function (IAppContainer $c) {
-				$server = $c->getServer();
-
-				return new Util(
-					new View(),
-					$c->query('Crypt'),
-					$server->getLogger(),
-					$server->getUserSession(),
-					$server->getConfig(),
-					$server->getUserManager());
-			});
-
-		$container->registerService('EncryptAll',
-			function (IAppContainer $c) {
-				$server = $c->getServer();
-				return new EncryptAll(
-					$c->query('UserSetup'),
-					$c->getServer()->getUserManager(),
-					new View(),
-					$c->query('KeyManager'),
-					$c->query('Util'),
-					$server->getConfig(),
-					$server->getMailer(),
-					$server->getL10N('encryption'),
-					new QuestionHelper(),
-					$server->getSecureRandom()
-				);
-			}
-		);
-
-		$container->registerService('DecryptAll',
-			function (IAppContainer $c) {
-				return new DecryptAll(
-					$c->query('Util'),
-					$c->query('KeyManager'),
-					$c->query('Crypt'),
-					$c->query('Session'),
-					new QuestionHelper()
-				);
-			}
-		);
-
-	}
+    /** @var IManager */
+    private $encryptionManager;
+    /** @var IConfig */
+    private $config;
+
+    /**
+     * @param array $urlParams
+     */
+    public function __construct($urlParams = []) {
+        parent::__construct('encryption', $urlParams);
+        $this->encryptionManager = \OC::$server->getEncryptionManager();
+        $this->config = \OC::$server->getConfig();
+        $this->registerServices();
+    }
+
+    public function setUp() {
+        if ($this->encryptionManager->isEnabled()) {
+            /** @var Setup $setup */
+            $setup = $this->getContainer()->query('UserSetup');
+            $setup->setupSystem();
+        }
+    }
+
+    /**
+     * register hooks
+     */
+    public function registerHooks() {
+        if (!$this->config->getSystemValueBool('maintenance')) {
+
+            $container = $this->getContainer();
+            $server = $container->getServer();
+            // Register our hooks and fire them.
+            $hookManager = new HookManager();
+
+            $hookManager->registerHook([
+                new UserHooks($container->query('KeyManager'),
+                    $server->getUserManager(),
+                    $server->getLogger(),
+                    $container->query('UserSetup'),
+                    $server->getUserSession(),
+                    $container->query('Util'),
+                    $container->query('Session'),
+                    $container->query('Crypt'),
+                    $container->query('Recovery'))
+            ]);
+
+            $hookManager->fireHooks();
+
+        } else {
+            // Logout user if we are in maintenance to force re-login
+            $this->getContainer()->getServer()->getUserSession()->logout();
+        }
+    }
+
+    public function registerEncryptionModule() {
+        $container = $this->getContainer();
+
+
+        $this->encryptionManager->registerEncryptionModule(
+            Encryption::ID,
+            Encryption::DISPLAY_NAME,
+            function () use ($container) {
+
+            return new Encryption(
+                $container->query('Crypt'),
+                $container->query('KeyManager'),
+                $container->query('Util'),
+                $container->query('Session'),
+                $container->query('EncryptAll'),
+                $container->query('DecryptAll'),
+                $container->getServer()->getLogger(),
+                $container->getServer()->getL10N($container->getAppName())
+            );
+        });
+
+    }
+
+    public function registerServices() {
+        $container = $this->getContainer();
+
+        $container->registerService('Crypt',
+            function (IAppContainer $c) {
+                $server = $c->getServer();
+                return new Crypt($server->getLogger(),
+                    $server->getUserSession(),
+                    $server->getConfig(),
+                    $server->getL10N($c->getAppName()));
+            });
+
+        $container->registerService('Session',
+            function (IAppContainer $c) {
+                $server = $c->getServer();
+                return new Session($server->getSession());
+            }
+        );
+
+        $container->registerService('KeyManager',
+            function (IAppContainer $c) {
+                $server = $c->getServer();
+
+                return new KeyManager($server->getEncryptionKeyStorage(),
+                    $c->query('Crypt'),
+                    $server->getConfig(),
+                    $server->getUserSession(),
+                    new Session($server->getSession()),
+                    $server->getLogger(),
+                    $c->query('Util')
+                );
+            });
+
+        $container->registerService('Recovery',
+            function (IAppContainer $c) {
+                $server = $c->getServer();
+
+                return new Recovery(
+                    $server->getUserSession(),
+                    $c->query('Crypt'),
+                    $c->query('KeyManager'),
+                    $server->getConfig(),
+                    $server->getEncryptionFilesHelper(),
+                    new View());
+            });
+
+        $container->registerService('RecoveryController', function (IAppContainer $c) {
+            $server = $c->getServer();
+            return new RecoveryController(
+                $c->getAppName(),
+                $server->getRequest(),
+                $server->getConfig(),
+                $server->getL10N($c->getAppName()),
+                $c->query('Recovery'));
+        });
+
+        $container->registerService('StatusController', function (IAppContainer $c) {
+            $server = $c->getServer();
+            return new StatusController(
+                $c->getAppName(),
+                $server->getRequest(),
+                $server->getL10N($c->getAppName()),
+                $c->query('Session'),
+                $server->getEncryptionManager()
+            );
+        });
+
+        $container->registerService('SettingsController', function (IAppContainer $c) {
+            $server = $c->getServer();
+            return new SettingsController(
+                $c->getAppName(),
+                $server->getRequest(),
+                $server->getL10N($c->getAppName()),
+                $server->getUserManager(),
+                $server->getUserSession(),
+                $c->query('KeyManager'),
+                $c->query('Crypt'),
+                $c->query('Session'),
+                $server->getSession(),
+                $c->query('Util')
+            );
+        });
+
+        $container->registerService('UserSetup',
+            function (IAppContainer $c) {
+                $server = $c->getServer();
+                return new Setup($server->getLogger(),
+                    $server->getUserSession(),
+                    $c->query('Crypt'),
+                    $c->query('KeyManager'));
+            });
+
+        $container->registerService('Util',
+            function (IAppContainer $c) {
+                $server = $c->getServer();
+
+                return new Util(
+                    new View(),
+                    $c->query('Crypt'),
+                    $server->getLogger(),
+                    $server->getUserSession(),
+                    $server->getConfig(),
+                    $server->getUserManager());
+            });
+
+        $container->registerService('EncryptAll',
+            function (IAppContainer $c) {
+                $server = $c->getServer();
+                return new EncryptAll(
+                    $c->query('UserSetup'),
+                    $c->getServer()->getUserManager(),
+                    new View(),
+                    $c->query('KeyManager'),
+                    $c->query('Util'),
+                    $server->getConfig(),
+                    $server->getMailer(),
+                    $server->getL10N('encryption'),
+                    new QuestionHelper(),
+                    $server->getSecureRandom()
+                );
+            }
+        );
+
+        $container->registerService('DecryptAll',
+            function (IAppContainer $c) {
+                return new DecryptAll(
+                    $c->query('Util'),
+                    $c->query('KeyManager'),
+                    $c->query('Crypt'),
+                    $c->query('Session'),
+                    new QuestionHelper()
+                );
+            }
+        );
+
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -111,7 +111,7 @@ 
 		$this->encryptionManager->registerEncryptionModule(
 			Encryption::ID,
 			Encryption::DISPLAY_NAME,
-			function () use ($container) {
+			function() use ($container) {
 
 			return new Encryption(
 				$container->query('Crypt'),
@@ -131,7 +131,7 @@ 
 		$container = $this->getContainer();
 
 		$container->registerService('Crypt',
-			function (IAppContainer $c) {
+			function(IAppContainer $c) {
 				$server = $c->getServer();
 				return new Crypt($server->getLogger(),
 					$server->getUserSession(),
@@ -140,14 +140,14 @@ 
 			});
 
 		$container->registerService('Session',
-			function (IAppContainer $c) {
+			function(IAppContainer $c) {
 				$server = $c->getServer();
 				return new Session($server->getSession());
 			}
 		);
 
 		$container->registerService('KeyManager',
-			function (IAppContainer $c) {
+			function(IAppContainer $c) {
 				$server = $c->getServer();
 
 				return new KeyManager($server->getEncryptionKeyStorage(),
@@ -161,7 +161,7 @@ 
 			});
 
 		$container->registerService('Recovery',
-			function (IAppContainer $c) {
+			function(IAppContainer $c) {
 				$server = $c->getServer();
 
 				return new Recovery(
@@ -173,7 +173,7 @@ 
 					new View());
 			});
 
-		$container->registerService('RecoveryController', function (IAppContainer $c) {
+		$container->registerService('RecoveryController', function(IAppContainer $c) {
 			$server = $c->getServer();
 			return new RecoveryController(
 				$c->getAppName(),
@@ -183,7 +183,7 @@ 
 				$c->query('Recovery'));
 		});
 
-		$container->registerService('StatusController', function (IAppContainer $c) {
+		$container->registerService('StatusController', function(IAppContainer $c) {
 			$server = $c->getServer();
 			return new StatusController(
 				$c->getAppName(),
@@ -194,7 +194,7 @@ 
 			);
 		});
 
-		$container->registerService('SettingsController', function (IAppContainer $c) {
+		$container->registerService('SettingsController', function(IAppContainer $c) {
 			$server = $c->getServer();
 			return new SettingsController(
 				$c->getAppName(),
@@ -211,7 +211,7 @@ 
 		});
 
 		$container->registerService('UserSetup',
-			function (IAppContainer $c) {
+			function(IAppContainer $c) {
 				$server = $c->getServer();
 				return new Setup($server->getLogger(),
 					$server->getUserSession(),
@@ -220,7 +220,7 @@ 
 			});
 
 		$container->registerService('Util',
-			function (IAppContainer $c) {
+			function(IAppContainer $c) {
 				$server = $c->getServer();
 
 				return new Util(
@@ -233,7 +233,7 @@ 
 			});
 
 		$container->registerService('EncryptAll',
-			function (IAppContainer $c) {
+			function(IAppContainer $c) {
 				$server = $c->getServer();
 				return new EncryptAll(
 					$c->query('UserSetup'),
@@ -251,7 +251,7 @@ 
 		);
 
 		$container->registerService('DecryptAll',
-			function (IAppContainer $c) {
+			function(IAppContainer $c) {
 				return new DecryptAll(
 					$c->query('Util'),
 					$c->query('KeyManager'),

apps/files_versions/lib/AppInfo/Application.php

Indentation +88 added lines, -88 removed lines

@@ -43,93 +43,93 @@
 
 class Application extends App {
 
-	const APP_ID = 'files_versions';
-
-	public function __construct(array $urlParams = []) {
-		parent::__construct(self::APP_ID, $urlParams);
-
-		$container = $this->getContainer();
-		$server = $container->getServer();
-
-		/** @var IEventDispatcher $newDispatcher */
-		$dispatcher = $server->query(IEventDispatcher::class);
-
-		/**
-		 * Register capabilities
-		 */
-		$container->registerCapability(Capabilities::class);
-
-		/**
-		 * Register $principalBackend for the DAV collection
-		 */
-		$container->registerService('principalBackend', function (IAppContainer $c) {
-			$server = $c->getServer();
-			return new Principal(
-				$server->getUserManager(),
-				$server->getGroupManager(),
-				$server->getShareManager(),
-				$server->getUserSession(),
-				$server->getAppManager(),
-				$server->query(ProxyMapper::class),
-				\OC::$server->getConfig()
-			);
-		});
-
-		$container->registerService(IVersionManager::class, function (IAppContainer $c) {
-			return new VersionManager();
-		});
-
-		$this->registerVersionBackends();
-
-		/**
-		 * Register Events
-		 */
-		$this->registerEvents($dispatcher);
-
-		/**
-		 * Register hooks
-		 */
-		Hooks::connectHooks();
-	}
-
-	public function registerVersionBackends() {
-		$server = $this->getContainer()->getServer();
-		$appManager = $server->getAppManager();
-		foreach($appManager->getInstalledApps() as $app) {
-			$appInfo = $appManager->getAppInfo($app);
-			if (isset($appInfo['versions'])) {
-				$backends = $appInfo['versions'];
-				foreach($backends as $backend) {
-					if (isset($backend['@value'])) {
-						$this->loadBackend($backend);
-					} else {
-						foreach ($backend as $singleBackend) {
-							$this->loadBackend($singleBackend);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private function loadBackend(array $backend) {
-		$server = $this->getContainer()->getServer();
-		$logger = $server->getLogger();
-		/** @var IVersionManager $versionManager */
-		$versionManager = $this->getContainer()->getServer()->query(IVersionManager::class);
-		$class = $backend['@value'];
-		$for = $backend['@attributes']['for'];
-		try {
-			$backendObject = $server->query($class);
-			$versionManager->registerBackend($for, $backendObject);
-		} catch (\Exception $e) {
-			$logger->logException($e);
-		}
-	}
-
-	protected function registerEvents(IEventDispatcher $dispatcher) {
-		$dispatcher->addServiceListener(LoadAdditionalScriptsEvent::class, LoadAdditionalListener::class);
-		$dispatcher->addServiceListener(LoadSidebar::class, LoadSidebarListener::class);
-	}
+    const APP_ID = 'files_versions';
+
+    public function __construct(array $urlParams = []) {
+        parent::__construct(self::APP_ID, $urlParams);
+
+        $container = $this->getContainer();
+        $server = $container->getServer();
+
+        /** @var IEventDispatcher $newDispatcher */
+        $dispatcher = $server->query(IEventDispatcher::class);
+
+        /**
+         * Register capabilities
+         */
+        $container->registerCapability(Capabilities::class);
+
+        /**
+         * Register $principalBackend for the DAV collection
+         */
+        $container->registerService('principalBackend', function (IAppContainer $c) {
+            $server = $c->getServer();
+            return new Principal(
+                $server->getUserManager(),
+                $server->getGroupManager(),
+                $server->getShareManager(),
+                $server->getUserSession(),
+                $server->getAppManager(),
+                $server->query(ProxyMapper::class),
+                \OC::$server->getConfig()
+            );
+        });
+
+        $container->registerService(IVersionManager::class, function (IAppContainer $c) {
+            return new VersionManager();
+        });
+
+        $this->registerVersionBackends();
+
+        /**
+         * Register Events
+         */
+        $this->registerEvents($dispatcher);
+
+        /**
+         * Register hooks
+         */
+        Hooks::connectHooks();
+    }
+
+    public function registerVersionBackends() {
+        $server = $this->getContainer()->getServer();
+        $appManager = $server->getAppManager();
+        foreach($appManager->getInstalledApps() as $app) {
+            $appInfo = $appManager->getAppInfo($app);
+            if (isset($appInfo['versions'])) {
+                $backends = $appInfo['versions'];
+                foreach($backends as $backend) {
+                    if (isset($backend['@value'])) {
+                        $this->loadBackend($backend);
+                    } else {
+                        foreach ($backend as $singleBackend) {
+                            $this->loadBackend($singleBackend);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private function loadBackend(array $backend) {
+        $server = $this->getContainer()->getServer();
+        $logger = $server->getLogger();
+        /** @var IVersionManager $versionManager */
+        $versionManager = $this->getContainer()->getServer()->query(IVersionManager::class);
+        $class = $backend['@value'];
+        $for = $backend['@attributes']['for'];
+        try {
+            $backendObject = $server->query($class);
+            $versionManager->registerBackend($for, $backendObject);
+        } catch (\Exception $e) {
+            $logger->logException($e);
+        }
+    }
+
+    protected function registerEvents(IEventDispatcher $dispatcher) {
+        $dispatcher->addServiceListener(LoadAdditionalScriptsEvent::class, LoadAdditionalListener::class);
+        $dispatcher->addServiceListener(LoadSidebar::class, LoadSidebarListener::class);
+    }
 
 }

Spacing +4 added lines, -4 removed lines

@@ -62,7 +62,7 @@ 
 		/**
 		 * Register $principalBackend for the DAV collection
 		 */
-		$container->registerService('principalBackend', function (IAppContainer $c) {
+		$container->registerService('principalBackend', function(IAppContainer $c) {
 			$server = $c->getServer();
 			return new Principal(
 				$server->getUserManager(),
@@ -75,7 +75,7 @@ 
 			);
 		});
 
-		$container->registerService(IVersionManager::class, function (IAppContainer $c) {
+		$container->registerService(IVersionManager::class, function(IAppContainer $c) {
 			return new VersionManager();
 		});
 
@@ -95,11 +95,11 @@ 
 	public function registerVersionBackends() {
 		$server = $this->getContainer()->getServer();
 		$appManager = $server->getAppManager();
-		foreach($appManager->getInstalledApps() as $app) {
+		foreach ($appManager->getInstalledApps() as $app) {
 			$appInfo = $appManager->getAppInfo($app);
 			if (isset($appInfo['versions'])) {
 				$backends = $appInfo['versions'];
-				foreach($backends as $backend) {
+				foreach ($backends as $backend) {
 					if (isset($backend['@value'])) {
 						$this->loadBackend($backend);
 					} else {

apps/files_versions/lib/Hooks.php

Indentation +96 added lines, -96 removed lines

@@ -41,108 +41,108 @@
 
 class Hooks {
 
-	public static function connectHooks() {
-		// Listen to write signals
-		Util::connectHook('OC_Filesystem', 'write', Hooks::class, 'write_hook');
-		// Listen to delete and rename signals
-		Util::connectHook('OC_Filesystem', 'post_delete', Hooks::class, 'remove_hook');
-		Util::connectHook('OC_Filesystem', 'delete', Hooks::class, 'pre_remove_hook');
-		Util::connectHook('OC_Filesystem', 'post_rename', Hooks::class, 'rename_hook');
-		Util::connectHook('OC_Filesystem', 'post_copy', Hooks::class, 'copy_hook');
-		Util::connectHook('OC_Filesystem', 'rename', Hooks::class, 'pre_renameOrCopy_hook');
-		Util::connectHook('OC_Filesystem', 'copy', Hooks::class, 'pre_renameOrCopy_hook');
-	}
+    public static function connectHooks() {
+        // Listen to write signals
+        Util::connectHook('OC_Filesystem', 'write', Hooks::class, 'write_hook');
+        // Listen to delete and rename signals
+        Util::connectHook('OC_Filesystem', 'post_delete', Hooks::class, 'remove_hook');
+        Util::connectHook('OC_Filesystem', 'delete', Hooks::class, 'pre_remove_hook');
+        Util::connectHook('OC_Filesystem', 'post_rename', Hooks::class, 'rename_hook');
+        Util::connectHook('OC_Filesystem', 'post_copy', Hooks::class, 'copy_hook');
+        Util::connectHook('OC_Filesystem', 'rename', Hooks::class, 'pre_renameOrCopy_hook');
+        Util::connectHook('OC_Filesystem', 'copy', Hooks::class, 'pre_renameOrCopy_hook');
+    }
 
-	/**
-	 * listen to write event.
-	 */
-	public static function write_hook($params) {
-		$path = $params[Filesystem::signal_param_path];
-		if($path !== '') {
-			Storage::store($path);
-		}
-	}
+    /**
+     * listen to write event.
+     */
+    public static function write_hook($params) {
+        $path = $params[Filesystem::signal_param_path];
+        if($path !== '') {
+            Storage::store($path);
+        }
+    }
 
 
-	/**
-	 * Erase versions of deleted file
-	 * @param array $params
-	 *
-	 * This function is connected to the delete signal of OC_Filesystem
-	 * cleanup the versions directory if the actual file gets deleted
-	 */
-	public static function remove_hook($params) {
-		$path = $params[Filesystem::signal_param_path];
-		if($path !== '') {
-			Storage::delete($path);
-		}
-	}
+    /**
+     * Erase versions of deleted file
+     * @param array $params
+     *
+     * This function is connected to the delete signal of OC_Filesystem
+     * cleanup the versions directory if the actual file gets deleted
+     */
+    public static function remove_hook($params) {
+        $path = $params[Filesystem::signal_param_path];
+        if($path !== '') {
+            Storage::delete($path);
+        }
+    }
 
-	/**
-	 * mark file as "deleted" so that we can clean up the versions if the file is gone
-	 * @param array $params
-	 */
-	public static function pre_remove_hook($params) {
-		$path = $params[Filesystem::signal_param_path];
-			if($path !== '') {
-				Storage::markDeletedFile($path);
-			}
-	}
+    /**
+     * mark file as "deleted" so that we can clean up the versions if the file is gone
+     * @param array $params
+     */
+    public static function pre_remove_hook($params) {
+        $path = $params[Filesystem::signal_param_path];
+            if($path !== '') {
+                Storage::markDeletedFile($path);
+            }
+    }
 
-	/**
-	 * rename/move versions of renamed/moved files
-	 * @param array $params array with oldpath and newpath
-	 *
-	 * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
-	 * of the stored versions along the actual file
-	 */
-	public static function rename_hook($params) {
-		$oldpath = $params['oldpath'];
-		$newpath = $params['newpath'];
-		if($oldpath !== '' && $newpath !== '') {
-			Storage::renameOrCopy($oldpath, $newpath, 'rename');
-		}
-	}
+    /**
+     * rename/move versions of renamed/moved files
+     * @param array $params array with oldpath and newpath
+     *
+     * This function is connected to the rename signal of OC_Filesystem and adjust the name and location
+     * of the stored versions along the actual file
+     */
+    public static function rename_hook($params) {
+        $oldpath = $params['oldpath'];
+        $newpath = $params['newpath'];
+        if($oldpath !== '' && $newpath !== '') {
+            Storage::renameOrCopy($oldpath, $newpath, 'rename');
+        }
+    }
 
-	/**
-	 * copy versions of copied files
-	 * @param array $params array with oldpath and newpath
-	 *
-	 * This function is connected to the copy signal of OC_Filesystem and copies the
-	 * the stored versions to the new location
-	 */
-	public static function copy_hook($params) {
-		$oldpath = $params['oldpath'];
-		$newpath = $params['newpath'];
-		if($oldpath !== '' && $newpath !== '') {
-			Storage::renameOrCopy($oldpath, $newpath, 'copy');
-		}
-	}
+    /**
+     * copy versions of copied files
+     * @param array $params array with oldpath and newpath
+     *
+     * This function is connected to the copy signal of OC_Filesystem and copies the
+     * the stored versions to the new location
+     */
+    public static function copy_hook($params) {
+        $oldpath = $params['oldpath'];
+        $newpath = $params['newpath'];
+        if($oldpath !== '' && $newpath !== '') {
+            Storage::renameOrCopy($oldpath, $newpath, 'copy');
+        }
+    }
 
-	/**
-	 * Remember owner and the owner path of the source file.
-	 * If the file already exists, then it was a upload of a existing file
-	 * over the web interface and we call Storage::store() directly
-	 *
-	 * @param array $params array with oldpath and newpath
-	 *
-	 */
-	public static function pre_renameOrCopy_hook($params) {
-		// if we rename a movable mount point, then the versions don't have
-		// to be renamed
-		$absOldPath = Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']);
-		$manager = Filesystem::getMountManager();
-		$mount = $manager->find($absOldPath);
-		$internalPath = $mount->getInternalPath($absOldPath);
-		if ($internalPath === '' and $mount instanceof MoveableMount) {
-			return;
-		}
+    /**
+     * Remember owner and the owner path of the source file.
+     * If the file already exists, then it was a upload of a existing file
+     * over the web interface and we call Storage::store() directly
+     *
+     * @param array $params array with oldpath and newpath
+     *
+     */
+    public static function pre_renameOrCopy_hook($params) {
+        // if we rename a movable mount point, then the versions don't have
+        // to be renamed
+        $absOldPath = Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']);
+        $manager = Filesystem::getMountManager();
+        $mount = $manager->find($absOldPath);
+        $internalPath = $mount->getInternalPath($absOldPath);
+        if ($internalPath === '' and $mount instanceof MoveableMount) {
+            return;
+        }
 
-		$view = new View(\OCP\User::getUser() . '/files');
-		if ($view->file_exists($params['newpath'])) {
-			Storage::store($params['newpath']);
-		} else {
-			Storage::setSourcePathAndUser($params['oldpath']);
-		}
-	}
+        $view = new View(\OCP\User::getUser() . '/files');
+        if ($view->file_exists($params['newpath'])) {
+            Storage::store($params['newpath']);
+        } else {
+            Storage::setSourcePathAndUser($params['oldpath']);
+        }
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -58,7 +58,7 @@ 
 	 */
 	public static function write_hook($params) {
 		$path = $params[Filesystem::signal_param_path];
-		if($path !== '') {
+		if ($path !== '') {
 			Storage::store($path);
 		}
 	}
@@ -73,7 +73,7 @@ 
 	 */
 	public static function remove_hook($params) {
 		$path = $params[Filesystem::signal_param_path];
-		if($path !== '') {
+		if ($path !== '') {
 			Storage::delete($path);
 		}
 	}
@@ -84,7 +84,7 @@ 
 	 */
 	public static function pre_remove_hook($params) {
 		$path = $params[Filesystem::signal_param_path];
-			if($path !== '') {
+			if ($path !== '') {
 				Storage::markDeletedFile($path);
 			}
 	}
@@ -99,7 +99,7 @@ 
 	public static function rename_hook($params) {
 		$oldpath = $params['oldpath'];
 		$newpath = $params['newpath'];
-		if($oldpath !== '' && $newpath !== '') {
+		if ($oldpath !== '' && $newpath !== '') {
 			Storage::renameOrCopy($oldpath, $newpath, 'rename');
 		}
 	}
@@ -114,7 +114,7 @@ 
 	public static function copy_hook($params) {
 		$oldpath = $params['oldpath'];
 		$newpath = $params['newpath'];
-		if($oldpath !== '' && $newpath !== '') {
+		if ($oldpath !== '' && $newpath !== '') {
 			Storage::renameOrCopy($oldpath, $newpath, 'copy');
 		}
 	}
@@ -130,7 +130,7 @@ 
 	public static function pre_renameOrCopy_hook($params) {
 		// if we rename a movable mount point, then the versions don't have
 		// to be renamed
-		$absOldPath = Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']);
+		$absOldPath = Filesystem::normalizePath('/'.\OCP\User::getUser().'/files'.$params['oldpath']);
 		$manager = Filesystem::getMountManager();
 		$mount = $manager->find($absOldPath);
 		$internalPath = $mount->getInternalPath($absOldPath);
@@ -138,7 +138,7 @@ 
 			return;
 		}
 
-		$view = new View(\OCP\User::getUser() . '/files');
+		$view = new View(\OCP\User::getUser().'/files');
 		if ($view->file_exists($params['newpath'])) {
 			Storage::store($params['newpath']);
 		} else {

apps/files_versions/lib/Storage.php

Indentation +796 added lines, -796 removed lines

@@ -58,801 +58,801 @@
 
 class Storage {
 
-	const DEFAULTENABLED=true;
-	const DEFAULTMAXSIZE=50; // unit: percentage; 50% of available disk space/quota
-	const VERSIONS_ROOT = 'files_versions/';
-
-	const DELETE_TRIGGER_MASTER_REMOVED = 0;
-	const DELETE_TRIGGER_RETENTION_CONSTRAINT = 1;
-	const DELETE_TRIGGER_QUOTA_EXCEEDED = 2;
-
-	// files for which we can remove the versions after the delete operation was successful
-	private static $deletedFiles = [];
-
-	private static $sourcePathAndUser = [];
-
-	private static $max_versions_per_interval = [
-		//first 10sec, one version every 2sec
-		1 => ['intervalEndsAfter' => 10,      'step' => 2],
-		//next minute, one version every 10sec
-		2 => ['intervalEndsAfter' => 60,      'step' => 10],
-		//next hour, one version every minute
-		3 => ['intervalEndsAfter' => 3600,    'step' => 60],
-		//next 24h, one version every hour
-		4 => ['intervalEndsAfter' => 86400,   'step' => 3600],
-		//next 30days, one version per day
-		5 => ['intervalEndsAfter' => 2592000, 'step' => 86400],
-		//until the end one version per week
-		6 => ['intervalEndsAfter' => -1,      'step' => 604800],
-	];
-
-	/** @var \OCA\Files_Versions\AppInfo\Application */
-	private static $application;
-
-	/**
-	 * get the UID of the owner of the file and the path to the file relative to
-	 * owners files folder
-	 *
-	 * @param string $filename
-	 * @return array
-	 * @throws \OC\User\NoUserException
-	 */
-	public static function getUidAndFilename($filename) {
-		$uid = Filesystem::getOwner($filename);
-		$userManager = \OC::$server->getUserManager();
-		// if the user with the UID doesn't exists, e.g. because the UID points
-		// to a remote user with a federated cloud ID we use the current logged-in
-		// user. We need a valid local user to create the versions
-		if (!$userManager->userExists($uid)) {
-			$uid = User::getUser();
-		}
-		Filesystem::initMountPoints($uid);
-		if ( $uid !== User::getUser() ) {
-			$info = Filesystem::getFileInfo($filename);
-			$ownerView = new View('/'.$uid.'/files');
-			try {
-				$filename = $ownerView->getPath($info['fileid']);
-				// make sure that the file name doesn't end with a trailing slash
-				// can for example happen single files shared across servers
-				$filename = rtrim($filename, '/');
-			} catch (NotFoundException $e) {
-				$filename = null;
-			}
-		}
-		return [$uid, $filename];
-	}
-
-	/**
-	 * Remember the owner and the owner path of the source file
-	 *
-	 * @param string $source source path
-	 */
-	public static function setSourcePathAndUser($source) {
-		list($uid, $path) = self::getUidAndFilename($source);
-		self::$sourcePathAndUser[$source] = ['uid' => $uid, 'path' => $path];
-	}
-
-	/**
-	 * Gets the owner and the owner path from the source path
-	 *
-	 * @param string $source source path
-	 * @return array with user id and path
-	 */
-	public static function getSourcePathAndUser($source) {
-
-		if (isset(self::$sourcePathAndUser[$source])) {
-			$uid = self::$sourcePathAndUser[$source]['uid'];
-			$path = self::$sourcePathAndUser[$source]['path'];
-			unset(self::$sourcePathAndUser[$source]);
-		} else {
-			$uid = $path = false;
-		}
-		return [$uid, $path];
-	}
-
-	/**
-	 * get current size of all versions from a given user
-	 *
-	 * @param string $user user who owns the versions
-	 * @return int versions size
-	 */
-	private static function getVersionsSize($user) {
-		$view = new View('/' . $user);
-		$fileInfo = $view->getFileInfo('/files_versions');
-		return isset($fileInfo['size']) ? $fileInfo['size'] : 0;
-	}
-
-	/**
-	 * store a new version of a file.
-	 */
-	public static function store($filename) {
-
-		// if the file gets streamed we need to remove the .part extension
-		// to get the right target
-		$ext = pathinfo($filename, PATHINFO_EXTENSION);
-		if ($ext === 'part') {
-			$filename = substr($filename, 0, -5);
-		}
-
-		// we only handle existing files
-		if (! Filesystem::file_exists($filename) || Filesystem::is_dir($filename)) {
-			return false;
-		}
-
-		list($uid, $filename) = self::getUidAndFilename($filename);
-
-		$files_view = new View('/'.$uid .'/files');
-
-		$eventDispatcher = \OC::$server->getEventDispatcher();
-		$fileInfo = $files_view->getFileInfo($filename);
-		$id = $fileInfo->getId();
-		$nodes = \OC::$server->getRootFolder()->getUserFolder($uid)->getById($id);
-		foreach ($nodes as $node) {
-			$event = new CreateVersionEvent($node);
-			$eventDispatcher->dispatch('OCA\Files_Versions::createVersion', $event);
-			if ($event->shouldCreateVersion() === false) {
-				return false;
-			}
-		}
-
-		// no use making versions for empty files
-		if ($fileInfo->getSize() === 0) {
-			return false;
-		}
-
-		/** @var IVersionManager $versionManager */
-		$versionManager = \OC::$server->query(IVersionManager::class);
-		$userManager = \OC::$server->getUserManager();
-		$user = $userManager->get($uid);
-
-		$versionManager->createVersion($user, $fileInfo);
-	}
-
-
-	/**
-	 * mark file as deleted so that we can remove the versions if the file is gone
-	 * @param string $path
-	 */
-	public static function markDeletedFile($path) {
-		list($uid, $filename) = self::getUidAndFilename($path);
-		self::$deletedFiles[$path] = [
-			'uid' => $uid,
-			'filename' => $filename];
-	}
-
-	/**
-	 * delete the version from the storage and cache
-	 *
-	 * @param View $view
-	 * @param string $path
-	 */
-	protected static function deleteVersion($view, $path) {
-		$view->unlink($path);
-		/**
-		 * @var \OC\Files\Storage\Storage $storage
-		 * @var string $internalPath
-		 */
-		list($storage, $internalPath) = $view->resolvePath($path);
-		$cache = $storage->getCache($internalPath);
-		$cache->remove($internalPath);
-	}
-
-	/**
-	 * Delete versions of a file
-	 */
-	public static function delete($path) {
-
-		$deletedFile = self::$deletedFiles[$path];
-		$uid = $deletedFile['uid'];
-		$filename = $deletedFile['filename'];
-
-		if (!Filesystem::file_exists($path)) {
-
-			$view = new View('/' . $uid . '/files_versions');
-
-			$versions = self::getVersions($uid, $filename);
-			if (!empty($versions)) {
-				foreach ($versions as $v) {
-					\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $path . $v['version'], 'trigger' => self::DELETE_TRIGGER_MASTER_REMOVED]);
-					self::deleteVersion($view, $filename . '.v' . $v['version']);
-					\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $path . $v['version'], 'trigger' => self::DELETE_TRIGGER_MASTER_REMOVED]);
-				}
-			}
-		}
-		unset(self::$deletedFiles[$path]);
-	}
-
-	/**
-	 * Rename or copy versions of a file of the given paths
-	 *
-	 * @param string $sourcePath source path of the file to move, relative to
-	 * the currently logged in user's "files" folder
-	 * @param string $targetPath target path of the file to move, relative to
-	 * the currently logged in user's "files" folder
-	 * @param string $operation can be 'copy' or 'rename'
-	 */
-	public static function renameOrCopy($sourcePath, $targetPath, $operation) {
-		list($sourceOwner, $sourcePath) = self::getSourcePathAndUser($sourcePath);
-
-		// it was a upload of a existing file if no old path exists
-		// in this case the pre-hook already called the store method and we can
-		// stop here
-		if ($sourcePath === false) {
-			return true;
-		}
-
-		list($targetOwner, $targetPath) = self::getUidAndFilename($targetPath);
-
-		$sourcePath = ltrim($sourcePath, '/');
-		$targetPath = ltrim($targetPath, '/');
-
-		$rootView = new View('');
-
-		// did we move a directory ?
-		if ($rootView->is_dir('/' . $targetOwner . '/files/' . $targetPath)) {
-			// does the directory exists for versions too ?
-			if ($rootView->is_dir('/' . $sourceOwner . '/files_versions/' . $sourcePath)) {
-				// create missing dirs if necessary
-				self::createMissingDirectories($targetPath, new View('/'. $targetOwner));
-
-				// move the directory containing the versions
-				$rootView->$operation(
-					'/' . $sourceOwner . '/files_versions/' . $sourcePath,
-					'/' . $targetOwner . '/files_versions/' . $targetPath
-				);
-			}
-		} else if ($versions = Storage::getVersions($sourceOwner, '/' . $sourcePath)) {
-			// create missing dirs if necessary
-			self::createMissingDirectories($targetPath, new View('/'. $targetOwner));
-
-			foreach ($versions as $v) {
-				// move each version one by one to the target directory
-				$rootView->$operation(
-					'/' . $sourceOwner . '/files_versions/' . $sourcePath.'.v' . $v['version'],
-					'/' . $targetOwner . '/files_versions/' . $targetPath.'.v'.$v['version']
-				);
-			}
-		}
-
-		// if we moved versions directly for a file, schedule expiration check for that file
-		if (!$rootView->is_dir('/' . $targetOwner . '/files/' . $targetPath)) {
-			self::scheduleExpire($targetOwner, $targetPath);
-		}
-
-	}
-
-	/**
-	 * Rollback to an old version of a file.
-	 *
-	 * @param string $file file name
-	 * @param int $revision revision timestamp
-	 * @return bool
-	 */
-	public static function rollback(string $file, int $revision, IUser $user) {
-
-		// add expected leading slash
-		$filename = '/' . ltrim($file, '/');
-
-		// Fetch the userfolder to trigger view hooks
-		$userFolder = \OC::$server->getUserFolder($user->getUID());
-
-		$users_view = new View('/'.$user->getUID());
-		$files_view = new View('/'. $user->getUID().'/files');
-
-		$versionCreated = false;
-
-		$fileInfo = $files_view->getFileInfo($file);
-
-		// check if user has the permissions to revert a version
-		if (!$fileInfo->isUpdateable()) {
-			return false;
-		}
-
-		//first create a new version
-		$version = 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename);
-		if (!$users_view->file_exists($version)) {
-			$users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename));
-			$versionCreated = true;
-		}
-
-		$fileToRestore =  'files_versions' . $filename . '.v' . $revision;
-
-		// Restore encrypted version of the old file for the newly restored file
-		// This has to happen manually here since the file is manually copied below
-		$oldVersion = $users_view->getFileInfo($fileToRestore)->getEncryptedVersion();
-		$oldFileInfo = $users_view->getFileInfo($fileToRestore);
-		$cache = $fileInfo->getStorage()->getCache();
-		$cache->update(
-			$fileInfo->getId(), [
-				'encrypted' => $oldVersion,
-				'encryptedVersion' => $oldVersion,
-				'size' => $oldFileInfo->getSize()
-			]
-		);
-
-		// rollback
-		if (self::copyFileContents($users_view, $fileToRestore, 'files' . $filename)) {
-			$files_view->touch($file, $revision);
-			Storage::scheduleExpire($user->getUID(), $file);
-
-			$node = $userFolder->get($file);
-
-			// TODO: move away from those legacy hooks!
-			\OC_Hook::emit('\OCP\Versions', 'rollback', [
-				'path' => $filename,
-				'revision' => $revision,
-				'node' => $node,
-			]);
-			return true;
-		} else if ($versionCreated) {
-			self::deleteVersion($users_view, $version);
-		}
-
-		return false;
-
-	}
-
-	/**
-	 * Stream copy file contents from $path1 to $path2
-	 *
-	 * @param View $view view to use for copying
-	 * @param string $path1 source file to copy
-	 * @param string $path2 target file
-	 *
-	 * @return bool true for success, false otherwise
-	 */
-	private static function copyFileContents($view, $path1, $path2) {
-		/** @var \OC\Files\Storage\Storage $storage1 */
-		list($storage1, $internalPath1) = $view->resolvePath($path1);
-		/** @var \OC\Files\Storage\Storage $storage2 */
-		list($storage2, $internalPath2) = $view->resolvePath($path2);
-
-		$view->lockFile($path1, ILockingProvider::LOCK_EXCLUSIVE);
-		$view->lockFile($path2, ILockingProvider::LOCK_EXCLUSIVE);
-
-		// TODO add a proper way of overwriting a file while maintaining file ids
-		if ($storage1->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage') || $storage2->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage')) {
-			$source = $storage1->fopen($internalPath1, 'r');
-			$target = $storage2->fopen($internalPath2, 'w');
-			list(, $result) = \OC_Helper::streamCopy($source, $target);
-			fclose($source);
-			fclose($target);
-
-			if ($result !== false) {
-				$storage1->unlink($internalPath1);
-			}
-		} else {
-			$result = $storage2->moveFromStorage($storage1, $internalPath1, $internalPath2);
-		}
-
-		$view->unlockFile($path1, ILockingProvider::LOCK_EXCLUSIVE);
-		$view->unlockFile($path2, ILockingProvider::LOCK_EXCLUSIVE);
-
-		return ($result !== false);
-	}
-
-	/**
-	 * get a list of all available versions of a file in descending chronological order
-	 * @param string $uid user id from the owner of the file
-	 * @param string $filename file to find versions of, relative to the user files dir
-	 * @param string $userFullPath
-	 * @return array versions newest version first
-	 */
-	public static function getVersions($uid, $filename, $userFullPath = '') {
-		$versions = [];
-		if (empty($filename)) {
-			return $versions;
-		}
-		// fetch for old versions
-		$view = new View('/' . $uid . '/');
-
-		$pathinfo = pathinfo($filename);
-		$versionedFile = $pathinfo['basename'];
-
-		$dir = Filesystem::normalizePath(self::VERSIONS_ROOT . '/' . $pathinfo['dirname']);
-
-		$dirContent = false;
-		if ($view->is_dir($dir)) {
-			$dirContent = $view->opendir($dir);
-		}
-
-		if ($dirContent === false) {
-			return $versions;
-		}
-
-		if (is_resource($dirContent)) {
-			while (($entryName = readdir($dirContent)) !== false) {
-				if (!Filesystem::isIgnoredDir($entryName)) {
-					$pathparts = pathinfo($entryName);
-					$filename = $pathparts['filename'];
-					if ($filename === $versionedFile) {
-						$pathparts = pathinfo($entryName);
-						$timestamp = substr($pathparts['extension'], 1);
-						$filename = $pathparts['filename'];
-						$key = $timestamp . '#' . $filename;
-						$versions[$key]['version'] = $timestamp;
-						$versions[$key]['humanReadableTimestamp'] = self::getHumanReadableTimestamp($timestamp);
-						if (empty($userFullPath)) {
-							$versions[$key]['preview'] = '';
-						} else {
-							$versions[$key]['preview'] = \OC::$server->getURLGenerator('files_version.Preview.getPreview', ['file' => $userFullPath, 'version' => $timestamp]);
-						}
-						$versions[$key]['path'] = Filesystem::normalizePath($pathinfo['dirname'] . '/' . $filename);
-						$versions[$key]['name'] = $versionedFile;
-						$versions[$key]['size'] = $view->filesize($dir . '/' . $entryName);
-						$versions[$key]['mimetype'] = \OC::$server->getMimeTypeDetector()->detectPath($versionedFile);
-					}
-				}
-			}
-			closedir($dirContent);
-		}
-
-		// sort with newest version first
-		krsort($versions);
-
-		return $versions;
-	}
-
-	/**
-	 * Expire versions that older than max version retention time
-	 * @param string $uid
-	 */
-	public static function expireOlderThanMaxForUser($uid) {
-		$expiration = self::getExpiration();
-		$threshold = $expiration->getMaxAgeAsTimestamp();
-		$versions = self::getAllVersions($uid);
-		if (!$threshold || !array_key_exists('all', $versions)) {
-			return;
-		}
-
-		$toDelete = [];
-		foreach (array_reverse($versions['all']) as $key => $version) {
-			if ((int)$version['version'] <$threshold) {
-				$toDelete[$key] = $version;
-			} else {
-				//Versions are sorted by time - nothing mo to iterate.
-				break;
-			}
-		}
-
-		$view = new View('/' . $uid . '/files_versions');
-		if (!empty($toDelete)) {
-			foreach ($toDelete as $version) {
-				\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT]);
-				self::deleteVersion($view, $version['path'] . '.v' . $version['version']);
-				\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT]);
-			}
-		}
-	}
-
-	/**
-	 * translate a timestamp into a string like "5 days ago"
-	 * @param int $timestamp
-	 * @return string for example "5 days ago"
-	 */
-	private static function getHumanReadableTimestamp($timestamp) {
-
-		$diff = time() - $timestamp;
-
-		if ($diff < 60) { // first minute
-			return  $diff . " seconds ago";
-		} elseif ($diff < 3600) { //first hour
-			return round($diff / 60) . " minutes ago";
-		} elseif ($diff < 86400) { // first day
-			return round($diff / 3600) . " hours ago";
-		} elseif ($diff < 604800) { //first week
-			return round($diff / 86400) . " days ago";
-		} elseif ($diff < 2419200) { //first month
-			return round($diff / 604800) . " weeks ago";
-		} elseif ($diff < 29030400) { // first year
-			return round($diff / 2419200) . " months ago";
-		} else {
-			return round($diff / 29030400) . " years ago";
-		}
-
-	}
-
-	/**
-	 * returns all stored file versions from a given user
-	 * @param string $uid id of the user
-	 * @return array with contains two arrays 'all' which contains all versions sorted by age and 'by_file' which contains all versions sorted by filename
-	 */
-	private static function getAllVersions($uid) {
-		$view = new View('/' . $uid . '/');
-		$dirs = [self::VERSIONS_ROOT];
-		$versions = [];
-
-		while (!empty($dirs)) {
-			$dir = array_pop($dirs);
-			$files = $view->getDirectoryContent($dir);
-
-			foreach ($files as $file) {
-				$fileData = $file->getData();
-				$filePath = $dir . '/' . $fileData['name'];
-				if ($file['type'] === 'dir') {
-					$dirs[] = $filePath;
-				} else {
-					$versionsBegin = strrpos($filePath, '.v');
-					$relPathStart = strlen(self::VERSIONS_ROOT);
-					$version = substr($filePath, $versionsBegin + 2);
-					$relpath = substr($filePath, $relPathStart, $versionsBegin - $relPathStart);
-					$key = $version . '#' . $relpath;
-					$versions[$key] = ['path' => $relpath, 'timestamp' => $version];
-				}
-			}
-		}
-
-		// newest version first
-		krsort($versions);
-
-		$result = [];
-
-		foreach ($versions as $key => $value) {
-			$size = $view->filesize(self::VERSIONS_ROOT.'/'.$value['path'].'.v'.$value['timestamp']);
-			$filename = $value['path'];
-
-			$result['all'][$key]['version'] = $value['timestamp'];
-			$result['all'][$key]['path'] = $filename;
-			$result['all'][$key]['size'] = $size;
-
-			$result['by_file'][$filename][$key]['version'] = $value['timestamp'];
-			$result['by_file'][$filename][$key]['path'] = $filename;
-			$result['by_file'][$filename][$key]['size'] = $size;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * get list of files we want to expire
-	 * @param array $versions list of versions
-	 * @param integer $time
-	 * @param bool $quotaExceeded is versions storage limit reached
-	 * @return array containing the list of to deleted versions and the size of them
-	 */
-	protected static function getExpireList($time, $versions, $quotaExceeded = false) {
-		$expiration = self::getExpiration();
-
-		if ($expiration->shouldAutoExpire()) {
-			list($toDelete, $size) = self::getAutoExpireList($time, $versions);
-		} else {
-			$size = 0;
-			$toDelete = [];  // versions we want to delete
-		}
-
-		foreach ($versions as $key => $version) {
-			if ($expiration->isExpired($version['version'], $quotaExceeded) && !isset($toDelete[$key])) {
-				$size += $version['size'];
-				$toDelete[$key] = $version['path'] . '.v' . $version['version'];
-			}
-		}
-
-		return [$toDelete, $size];
-	}
-
-	/**
-	 * get list of files we want to expire
-	 * @param array $versions list of versions
-	 * @param integer $time
-	 * @return array containing the list of to deleted versions and the size of them
-	 */
-	protected static function getAutoExpireList($time, $versions) {
-		$size = 0;
-		$toDelete = [];  // versions we want to delete
-
-		$interval = 1;
-		$step = Storage::$max_versions_per_interval[$interval]['step'];
-		if (Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] === -1) {
-			$nextInterval = -1;
-		} else {
-			$nextInterval = $time - Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'];
-		}
-
-		$firstVersion = reset($versions);
-		$firstKey = key($versions);
-		$prevTimestamp = $firstVersion['version'];
-		$nextVersion = $firstVersion['version'] - $step;
-		unset($versions[$firstKey]);
-
-		foreach ($versions as $key => $version) {
-			$newInterval = true;
-			while ($newInterval) {
-				if ($nextInterval === -1 || $prevTimestamp > $nextInterval) {
-					if ($version['version'] > $nextVersion) {
-						//distance between two version too small, mark to delete
-						$toDelete[$key] = $version['path'] . '.v' . $version['version'];
-						$size += $version['size'];
-						\OC::$server->getLogger()->info('Mark to expire '. $version['path'] .' next version should be ' . $nextVersion . " or smaller. (prevTimestamp: " . $prevTimestamp . "; step: " . $step, ['app' => 'files_versions']);
-					} else {
-						$nextVersion = $version['version'] - $step;
-						$prevTimestamp = $version['version'];
-					}
-					$newInterval = false; // version checked so we can move to the next one
-				} else { // time to move on to the next interval
-					$interval++;
-					$step = Storage::$max_versions_per_interval[$interval]['step'];
-					$nextVersion = $prevTimestamp - $step;
-					if (Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] === -1) {
-						$nextInterval = -1;
-					} else {
-						$nextInterval = $time - Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'];
-					}
-					$newInterval = true; // we changed the interval -> check same version with new interval
-				}
-			}
-		}
-
-		return [$toDelete, $size];
-	}
-
-	/**
-	 * Schedule versions expiration for the given file
-	 *
-	 * @param string $uid owner of the file
-	 * @param string $fileName file/folder for which to schedule expiration
-	 */
-	public static function scheduleExpire($uid, $fileName) {
-		// let the admin disable auto expire
-		$expiration = self::getExpiration();
-		if ($expiration->isEnabled()) {
-			$command = new Expire($uid, $fileName);
-			\OC::$server->getCommandBus()->push($command);
-		}
-	}
-
-	/**
-	 * Expire versions which exceed the quota.
-	 *
-	 * This will setup the filesystem for the given user but will not
-	 * tear it down afterwards.
-	 *
-	 * @param string $filename path to file to expire
-	 * @param string $uid user for which to expire the version
-	 * @return bool|int|null
-	 */
-	public static function expire($filename, $uid) {
-		$expiration = self::getExpiration();
-
-		if ($expiration->isEnabled()) {
-			// get available disk space for user
-			$user = \OC::$server->getUserManager()->get($uid);
-			if (is_null($user)) {
-				\OC::$server->getLogger()->error('Backends provided no user object for ' . $uid, ['app' => 'files_versions']);
-				throw new \OC\User\NoUserException('Backends provided no user object for ' . $uid);
-			}
-
-			\OC_Util::setupFS($uid);
-
-			if (!Filesystem::file_exists($filename)) {
-				return false;
-			}
-
-			if (empty($filename)) {
-				// file maybe renamed or deleted
-				return false;
-			}
-			$versionsFileview = new View('/'.$uid.'/files_versions');
-
-			$softQuota = true;
-			$quota = $user->getQuota();
-			if ( $quota === null || $quota === 'none' ) {
-				$quota = Filesystem::free_space('/');
-				$softQuota = false;
-			} else {
-				$quota = \OCP\Util::computerFileSize($quota);
-			}
-
-			// make sure that we have the current size of the version history
-			$versionsSize = self::getVersionsSize($uid);
-
-			// calculate available space for version history
-			// subtract size of files and current versions size from quota
-			if ($quota >= 0) {
-				if ($softQuota) {
-					$userFolder = \OC::$server->getUserFolder($uid);
-					if(is_null($userFolder)) {
-						$availableSpace = 0;
-					} else {
-						$free = $quota - $userFolder->getSize(false); // remaining free space for user
-						if ($free > 0) {
-							$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $versionsSize; // how much space can be used for versions
-						} else {
-							$availableSpace = $free - $versionsSize;
-						}
-					}
-				} else {
-					$availableSpace = $quota;
-				}
-			} else {
-				$availableSpace = PHP_INT_MAX;
-			}
-
-			$allVersions = Storage::getVersions($uid, $filename);
-
-			$time = time();
-			list($toDelete, $sizeOfDeletedVersions) = self::getExpireList($time, $allVersions, $availableSpace <= 0);
-
-			$availableSpace = $availableSpace + $sizeOfDeletedVersions;
-			$versionsSize = $versionsSize - $sizeOfDeletedVersions;
-
-			// if still not enough free space we rearrange the versions from all files
-			if ($availableSpace <= 0) {
-				$result = Storage::getAllVersions($uid);
-				$allVersions = $result['all'];
-
-				foreach ($result['by_file'] as $versions) {
-					list($toDeleteNew, $size) = self::getExpireList($time, $versions, $availableSpace <= 0);
-					$toDelete = array_merge($toDelete, $toDeleteNew);
-					$sizeOfDeletedVersions += $size;
-				}
-				$availableSpace = $availableSpace + $sizeOfDeletedVersions;
-				$versionsSize = $versionsSize - $sizeOfDeletedVersions;
-			}
-
-			$logger = \OC::$server->getLogger();
-			foreach($toDelete as $key => $path) {
-				\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $path, 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
-				self::deleteVersion($versionsFileview, $path);
-				\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $path, 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
-				unset($allVersions[$key]); // update array with the versions we keep
-				$logger->info('Expire: ' . $path, ['app' => 'files_versions']);
-			}
-
-			// Check if enough space is available after versions are rearranged.
-			// If not we delete the oldest versions until we meet the size limit for versions,
-			// but always keep the two latest versions
-			$numOfVersions = count($allVersions) -2 ;
-			$i = 0;
-			// sort oldest first and make sure that we start at the first element
-			ksort($allVersions);
-			reset($allVersions);
-			while ($availableSpace < 0 && $i < $numOfVersions) {
-				$version = current($allVersions);
-				\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
-				self::deleteVersion($versionsFileview, $version['path'] . '.v' . $version['version']);
-				\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
-				\OC::$server->getLogger()->info('running out of space! Delete oldest version: ' . $version['path'].'.v'.$version['version'], ['app' => 'files_versions']);
-				$versionsSize -= $version['size'];
-				$availableSpace += $version['size'];
-				next($allVersions);
-				$i++;
-			}
-
-			return $versionsSize; // finally return the new size of the version history
-		}
-
-		return false;
-	}
-
-	/**
-	 * Create recursively missing directories inside of files_versions
-	 * that match the given path to a file.
-	 *
-	 * @param string $filename $path to a file, relative to the user's
-	 * "files" folder
-	 * @param View $view view on data/user/
-	 */
-	public static function createMissingDirectories($filename, $view) {
-		$dirname = Filesystem::normalizePath(dirname($filename));
-		$dirParts = explode('/', $dirname);
-		$dir = "/files_versions";
-		foreach ($dirParts as $part) {
-			$dir = $dir . '/' . $part;
-			if (!$view->file_exists($dir)) {
-				$view->mkdir($dir);
-			}
-		}
-	}
-
-	/**
-	 * Static workaround
-	 * @return Expiration
-	 */
-	protected static function getExpiration() {
-		if (self::$application === null) {
-			self::$application = \OC::$server->query(Application::class);
-		}
-		return self::$application->getContainer()->query(Expiration::class);
-	}
+    const DEFAULTENABLED=true;
+    const DEFAULTMAXSIZE=50; // unit: percentage; 50% of available disk space/quota
+    const VERSIONS_ROOT = 'files_versions/';
+
+    const DELETE_TRIGGER_MASTER_REMOVED = 0;
+    const DELETE_TRIGGER_RETENTION_CONSTRAINT = 1;
+    const DELETE_TRIGGER_QUOTA_EXCEEDED = 2;
+
+    // files for which we can remove the versions after the delete operation was successful
+    private static $deletedFiles = [];
+
+    private static $sourcePathAndUser = [];
+
+    private static $max_versions_per_interval = [
+        //first 10sec, one version every 2sec
+        1 => ['intervalEndsAfter' => 10,      'step' => 2],
+        //next minute, one version every 10sec
+        2 => ['intervalEndsAfter' => 60,      'step' => 10],
+        //next hour, one version every minute
+        3 => ['intervalEndsAfter' => 3600,    'step' => 60],
+        //next 24h, one version every hour
+        4 => ['intervalEndsAfter' => 86400,   'step' => 3600],
+        //next 30days, one version per day
+        5 => ['intervalEndsAfter' => 2592000, 'step' => 86400],
+        //until the end one version per week
+        6 => ['intervalEndsAfter' => -1,      'step' => 604800],
+    ];
+
+    /** @var \OCA\Files_Versions\AppInfo\Application */
+    private static $application;
+
+    /**
+     * get the UID of the owner of the file and the path to the file relative to
+     * owners files folder
+     *
+     * @param string $filename
+     * @return array
+     * @throws \OC\User\NoUserException
+     */
+    public static function getUidAndFilename($filename) {
+        $uid = Filesystem::getOwner($filename);
+        $userManager = \OC::$server->getUserManager();
+        // if the user with the UID doesn't exists, e.g. because the UID points
+        // to a remote user with a federated cloud ID we use the current logged-in
+        // user. We need a valid local user to create the versions
+        if (!$userManager->userExists($uid)) {
+            $uid = User::getUser();
+        }
+        Filesystem::initMountPoints($uid);
+        if ( $uid !== User::getUser() ) {
+            $info = Filesystem::getFileInfo($filename);
+            $ownerView = new View('/'.$uid.'/files');
+            try {
+                $filename = $ownerView->getPath($info['fileid']);
+                // make sure that the file name doesn't end with a trailing slash
+                // can for example happen single files shared across servers
+                $filename = rtrim($filename, '/');
+            } catch (NotFoundException $e) {
+                $filename = null;
+            }
+        }
+        return [$uid, $filename];
+    }
+
+    /**
+     * Remember the owner and the owner path of the source file
+     *
+     * @param string $source source path
+     */
+    public static function setSourcePathAndUser($source) {
+        list($uid, $path) = self::getUidAndFilename($source);
+        self::$sourcePathAndUser[$source] = ['uid' => $uid, 'path' => $path];
+    }
+
+    /**
+     * Gets the owner and the owner path from the source path
+     *
+     * @param string $source source path
+     * @return array with user id and path
+     */
+    public static function getSourcePathAndUser($source) {
+
+        if (isset(self::$sourcePathAndUser[$source])) {
+            $uid = self::$sourcePathAndUser[$source]['uid'];
+            $path = self::$sourcePathAndUser[$source]['path'];
+            unset(self::$sourcePathAndUser[$source]);
+        } else {
+            $uid = $path = false;
+        }
+        return [$uid, $path];
+    }
+
+    /**
+     * get current size of all versions from a given user
+     *
+     * @param string $user user who owns the versions
+     * @return int versions size
+     */
+    private static function getVersionsSize($user) {
+        $view = new View('/' . $user);
+        $fileInfo = $view->getFileInfo('/files_versions');
+        return isset($fileInfo['size']) ? $fileInfo['size'] : 0;
+    }
+
+    /**
+     * store a new version of a file.
+     */
+    public static function store($filename) {
+
+        // if the file gets streamed we need to remove the .part extension
+        // to get the right target
+        $ext = pathinfo($filename, PATHINFO_EXTENSION);
+        if ($ext === 'part') {
+            $filename = substr($filename, 0, -5);
+        }
+
+        // we only handle existing files
+        if (! Filesystem::file_exists($filename) || Filesystem::is_dir($filename)) {
+            return false;
+        }
+
+        list($uid, $filename) = self::getUidAndFilename($filename);
+
+        $files_view = new View('/'.$uid .'/files');
+
+        $eventDispatcher = \OC::$server->getEventDispatcher();
+        $fileInfo = $files_view->getFileInfo($filename);
+        $id = $fileInfo->getId();
+        $nodes = \OC::$server->getRootFolder()->getUserFolder($uid)->getById($id);
+        foreach ($nodes as $node) {
+            $event = new CreateVersionEvent($node);
+            $eventDispatcher->dispatch('OCA\Files_Versions::createVersion', $event);
+            if ($event->shouldCreateVersion() === false) {
+                return false;
+            }
+        }
+
+        // no use making versions for empty files
+        if ($fileInfo->getSize() === 0) {
+            return false;
+        }
+
+        /** @var IVersionManager $versionManager */
+        $versionManager = \OC::$server->query(IVersionManager::class);
+        $userManager = \OC::$server->getUserManager();
+        $user = $userManager->get($uid);
+
+        $versionManager->createVersion($user, $fileInfo);
+    }
+
+
+    /**
+     * mark file as deleted so that we can remove the versions if the file is gone
+     * @param string $path
+     */
+    public static function markDeletedFile($path) {
+        list($uid, $filename) = self::getUidAndFilename($path);
+        self::$deletedFiles[$path] = [
+            'uid' => $uid,
+            'filename' => $filename];
+    }
+
+    /**
+     * delete the version from the storage and cache
+     *
+     * @param View $view
+     * @param string $path
+     */
+    protected static function deleteVersion($view, $path) {
+        $view->unlink($path);
+        /**
+         * @var \OC\Files\Storage\Storage $storage
+         * @var string $internalPath
+         */
+        list($storage, $internalPath) = $view->resolvePath($path);
+        $cache = $storage->getCache($internalPath);
+        $cache->remove($internalPath);
+    }
+
+    /**
+     * Delete versions of a file
+     */
+    public static function delete($path) {
+
+        $deletedFile = self::$deletedFiles[$path];
+        $uid = $deletedFile['uid'];
+        $filename = $deletedFile['filename'];
+
+        if (!Filesystem::file_exists($path)) {
+
+            $view = new View('/' . $uid . '/files_versions');
+
+            $versions = self::getVersions($uid, $filename);
+            if (!empty($versions)) {
+                foreach ($versions as $v) {
+                    \OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $path . $v['version'], 'trigger' => self::DELETE_TRIGGER_MASTER_REMOVED]);
+                    self::deleteVersion($view, $filename . '.v' . $v['version']);
+                    \OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $path . $v['version'], 'trigger' => self::DELETE_TRIGGER_MASTER_REMOVED]);
+                }
+            }
+        }
+        unset(self::$deletedFiles[$path]);
+    }
+
+    /**
+     * Rename or copy versions of a file of the given paths
+     *
+     * @param string $sourcePath source path of the file to move, relative to
+     * the currently logged in user's "files" folder
+     * @param string $targetPath target path of the file to move, relative to
+     * the currently logged in user's "files" folder
+     * @param string $operation can be 'copy' or 'rename'
+     */
+    public static function renameOrCopy($sourcePath, $targetPath, $operation) {
+        list($sourceOwner, $sourcePath) = self::getSourcePathAndUser($sourcePath);
+
+        // it was a upload of a existing file if no old path exists
+        // in this case the pre-hook already called the store method and we can
+        // stop here
+        if ($sourcePath === false) {
+            return true;
+        }
+
+        list($targetOwner, $targetPath) = self::getUidAndFilename($targetPath);
+
+        $sourcePath = ltrim($sourcePath, '/');
+        $targetPath = ltrim($targetPath, '/');
+
+        $rootView = new View('');
+
+        // did we move a directory ?
+        if ($rootView->is_dir('/' . $targetOwner . '/files/' . $targetPath)) {
+            // does the directory exists for versions too ?
+            if ($rootView->is_dir('/' . $sourceOwner . '/files_versions/' . $sourcePath)) {
+                // create missing dirs if necessary
+                self::createMissingDirectories($targetPath, new View('/'. $targetOwner));
+
+                // move the directory containing the versions
+                $rootView->$operation(
+                    '/' . $sourceOwner . '/files_versions/' . $sourcePath,
+                    '/' . $targetOwner . '/files_versions/' . $targetPath
+                );
+            }
+        } else if ($versions = Storage::getVersions($sourceOwner, '/' . $sourcePath)) {
+            // create missing dirs if necessary
+            self::createMissingDirectories($targetPath, new View('/'. $targetOwner));
+
+            foreach ($versions as $v) {
+                // move each version one by one to the target directory
+                $rootView->$operation(
+                    '/' . $sourceOwner . '/files_versions/' . $sourcePath.'.v' . $v['version'],
+                    '/' . $targetOwner . '/files_versions/' . $targetPath.'.v'.$v['version']
+                );
+            }
+        }
+
+        // if we moved versions directly for a file, schedule expiration check for that file
+        if (!$rootView->is_dir('/' . $targetOwner . '/files/' . $targetPath)) {
+            self::scheduleExpire($targetOwner, $targetPath);
+        }
+
+    }
+
+    /**
+     * Rollback to an old version of a file.
+     *
+     * @param string $file file name
+     * @param int $revision revision timestamp
+     * @return bool
+     */
+    public static function rollback(string $file, int $revision, IUser $user) {
+
+        // add expected leading slash
+        $filename = '/' . ltrim($file, '/');
+
+        // Fetch the userfolder to trigger view hooks
+        $userFolder = \OC::$server->getUserFolder($user->getUID());
+
+        $users_view = new View('/'.$user->getUID());
+        $files_view = new View('/'. $user->getUID().'/files');
+
+        $versionCreated = false;
+
+        $fileInfo = $files_view->getFileInfo($file);
+
+        // check if user has the permissions to revert a version
+        if (!$fileInfo->isUpdateable()) {
+            return false;
+        }
+
+        //first create a new version
+        $version = 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename);
+        if (!$users_view->file_exists($version)) {
+            $users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename));
+            $versionCreated = true;
+        }
+
+        $fileToRestore =  'files_versions' . $filename . '.v' . $revision;
+
+        // Restore encrypted version of the old file for the newly restored file
+        // This has to happen manually here since the file is manually copied below
+        $oldVersion = $users_view->getFileInfo($fileToRestore)->getEncryptedVersion();
+        $oldFileInfo = $users_view->getFileInfo($fileToRestore);
+        $cache = $fileInfo->getStorage()->getCache();
+        $cache->update(
+            $fileInfo->getId(), [
+                'encrypted' => $oldVersion,
+                'encryptedVersion' => $oldVersion,
+                'size' => $oldFileInfo->getSize()
+            ]
+        );
+
+        // rollback
+        if (self::copyFileContents($users_view, $fileToRestore, 'files' . $filename)) {
+            $files_view->touch($file, $revision);
+            Storage::scheduleExpire($user->getUID(), $file);
+
+            $node = $userFolder->get($file);
+
+            // TODO: move away from those legacy hooks!
+            \OC_Hook::emit('\OCP\Versions', 'rollback', [
+                'path' => $filename,
+                'revision' => $revision,
+                'node' => $node,
+            ]);
+            return true;
+        } else if ($versionCreated) {
+            self::deleteVersion($users_view, $version);
+        }
+
+        return false;
+
+    }
+
+    /**
+     * Stream copy file contents from $path1 to $path2
+     *
+     * @param View $view view to use for copying
+     * @param string $path1 source file to copy
+     * @param string $path2 target file
+     *
+     * @return bool true for success, false otherwise
+     */
+    private static function copyFileContents($view, $path1, $path2) {
+        /** @var \OC\Files\Storage\Storage $storage1 */
+        list($storage1, $internalPath1) = $view->resolvePath($path1);
+        /** @var \OC\Files\Storage\Storage $storage2 */
+        list($storage2, $internalPath2) = $view->resolvePath($path2);
+
+        $view->lockFile($path1, ILockingProvider::LOCK_EXCLUSIVE);
+        $view->lockFile($path2, ILockingProvider::LOCK_EXCLUSIVE);
+
+        // TODO add a proper way of overwriting a file while maintaining file ids
+        if ($storage1->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage') || $storage2->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage')) {
+            $source = $storage1->fopen($internalPath1, 'r');
+            $target = $storage2->fopen($internalPath2, 'w');
+            list(, $result) = \OC_Helper::streamCopy($source, $target);
+            fclose($source);
+            fclose($target);
+
+            if ($result !== false) {
+                $storage1->unlink($internalPath1);
+            }
+        } else {
+            $result = $storage2->moveFromStorage($storage1, $internalPath1, $internalPath2);
+        }
+
+        $view->unlockFile($path1, ILockingProvider::LOCK_EXCLUSIVE);
+        $view->unlockFile($path2, ILockingProvider::LOCK_EXCLUSIVE);
+
+        return ($result !== false);
+    }
+
+    /**
+     * get a list of all available versions of a file in descending chronological order
+     * @param string $uid user id from the owner of the file
+     * @param string $filename file to find versions of, relative to the user files dir
+     * @param string $userFullPath
+     * @return array versions newest version first
+     */
+    public static function getVersions($uid, $filename, $userFullPath = '') {
+        $versions = [];
+        if (empty($filename)) {
+            return $versions;
+        }
+        // fetch for old versions
+        $view = new View('/' . $uid . '/');
+
+        $pathinfo = pathinfo($filename);
+        $versionedFile = $pathinfo['basename'];
+
+        $dir = Filesystem::normalizePath(self::VERSIONS_ROOT . '/' . $pathinfo['dirname']);
+
+        $dirContent = false;
+        if ($view->is_dir($dir)) {
+            $dirContent = $view->opendir($dir);
+        }
+
+        if ($dirContent === false) {
+            return $versions;
+        }
+
+        if (is_resource($dirContent)) {
+            while (($entryName = readdir($dirContent)) !== false) {
+                if (!Filesystem::isIgnoredDir($entryName)) {
+                    $pathparts = pathinfo($entryName);
+                    $filename = $pathparts['filename'];
+                    if ($filename === $versionedFile) {
+                        $pathparts = pathinfo($entryName);
+                        $timestamp = substr($pathparts['extension'], 1);
+                        $filename = $pathparts['filename'];
+                        $key = $timestamp . '#' . $filename;
+                        $versions[$key]['version'] = $timestamp;
+                        $versions[$key]['humanReadableTimestamp'] = self::getHumanReadableTimestamp($timestamp);
+                        if (empty($userFullPath)) {
+                            $versions[$key]['preview'] = '';
+                        } else {
+                            $versions[$key]['preview'] = \OC::$server->getURLGenerator('files_version.Preview.getPreview', ['file' => $userFullPath, 'version' => $timestamp]);
+                        }
+                        $versions[$key]['path'] = Filesystem::normalizePath($pathinfo['dirname'] . '/' . $filename);
+                        $versions[$key]['name'] = $versionedFile;
+                        $versions[$key]['size'] = $view->filesize($dir . '/' . $entryName);
+                        $versions[$key]['mimetype'] = \OC::$server->getMimeTypeDetector()->detectPath($versionedFile);
+                    }
+                }
+            }
+            closedir($dirContent);
+        }
+
+        // sort with newest version first
+        krsort($versions);
+
+        return $versions;
+    }
+
+    /**
+     * Expire versions that older than max version retention time
+     * @param string $uid
+     */
+    public static function expireOlderThanMaxForUser($uid) {
+        $expiration = self::getExpiration();
+        $threshold = $expiration->getMaxAgeAsTimestamp();
+        $versions = self::getAllVersions($uid);
+        if (!$threshold || !array_key_exists('all', $versions)) {
+            return;
+        }
+
+        $toDelete = [];
+        foreach (array_reverse($versions['all']) as $key => $version) {
+            if ((int)$version['version'] <$threshold) {
+                $toDelete[$key] = $version;
+            } else {
+                //Versions are sorted by time - nothing mo to iterate.
+                break;
+            }
+        }
+
+        $view = new View('/' . $uid . '/files_versions');
+        if (!empty($toDelete)) {
+            foreach ($toDelete as $version) {
+                \OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT]);
+                self::deleteVersion($view, $version['path'] . '.v' . $version['version']);
+                \OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT]);
+            }
+        }
+    }
+
+    /**
+     * translate a timestamp into a string like "5 days ago"
+     * @param int $timestamp
+     * @return string for example "5 days ago"
+     */
+    private static function getHumanReadableTimestamp($timestamp) {
+
+        $diff = time() - $timestamp;
+
+        if ($diff < 60) { // first minute
+            return  $diff . " seconds ago";
+        } elseif ($diff < 3600) { //first hour
+            return round($diff / 60) . " minutes ago";
+        } elseif ($diff < 86400) { // first day
+            return round($diff / 3600) . " hours ago";
+        } elseif ($diff < 604800) { //first week
+            return round($diff / 86400) . " days ago";
+        } elseif ($diff < 2419200) { //first month
+            return round($diff / 604800) . " weeks ago";
+        } elseif ($diff < 29030400) { // first year
+            return round($diff / 2419200) . " months ago";
+        } else {
+            return round($diff / 29030400) . " years ago";
+        }
+
+    }
+
+    /**
+     * returns all stored file versions from a given user
+     * @param string $uid id of the user
+     * @return array with contains two arrays 'all' which contains all versions sorted by age and 'by_file' which contains all versions sorted by filename
+     */
+    private static function getAllVersions($uid) {
+        $view = new View('/' . $uid . '/');
+        $dirs = [self::VERSIONS_ROOT];
+        $versions = [];
+
+        while (!empty($dirs)) {
+            $dir = array_pop($dirs);
+            $files = $view->getDirectoryContent($dir);
+
+            foreach ($files as $file) {
+                $fileData = $file->getData();
+                $filePath = $dir . '/' . $fileData['name'];
+                if ($file['type'] === 'dir') {
+                    $dirs[] = $filePath;
+                } else {
+                    $versionsBegin = strrpos($filePath, '.v');
+                    $relPathStart = strlen(self::VERSIONS_ROOT);
+                    $version = substr($filePath, $versionsBegin + 2);
+                    $relpath = substr($filePath, $relPathStart, $versionsBegin - $relPathStart);
+                    $key = $version . '#' . $relpath;
+                    $versions[$key] = ['path' => $relpath, 'timestamp' => $version];
+                }
+            }
+        }
+
+        // newest version first
+        krsort($versions);
+
+        $result = [];
+
+        foreach ($versions as $key => $value) {
+            $size = $view->filesize(self::VERSIONS_ROOT.'/'.$value['path'].'.v'.$value['timestamp']);
+            $filename = $value['path'];
+
+            $result['all'][$key]['version'] = $value['timestamp'];
+            $result['all'][$key]['path'] = $filename;
+            $result['all'][$key]['size'] = $size;
+
+            $result['by_file'][$filename][$key]['version'] = $value['timestamp'];
+            $result['by_file'][$filename][$key]['path'] = $filename;
+            $result['by_file'][$filename][$key]['size'] = $size;
+        }
+
+        return $result;
+    }
+
+    /**
+     * get list of files we want to expire
+     * @param array $versions list of versions
+     * @param integer $time
+     * @param bool $quotaExceeded is versions storage limit reached
+     * @return array containing the list of to deleted versions and the size of them
+     */
+    protected static function getExpireList($time, $versions, $quotaExceeded = false) {
+        $expiration = self::getExpiration();
+
+        if ($expiration->shouldAutoExpire()) {
+            list($toDelete, $size) = self::getAutoExpireList($time, $versions);
+        } else {
+            $size = 0;
+            $toDelete = [];  // versions we want to delete
+        }
+
+        foreach ($versions as $key => $version) {
+            if ($expiration->isExpired($version['version'], $quotaExceeded) && !isset($toDelete[$key])) {
+                $size += $version['size'];
+                $toDelete[$key] = $version['path'] . '.v' . $version['version'];
+            }
+        }
+
+        return [$toDelete, $size];
+    }
+
+    /**
+     * get list of files we want to expire
+     * @param array $versions list of versions
+     * @param integer $time
+     * @return array containing the list of to deleted versions and the size of them
+     */
+    protected static function getAutoExpireList($time, $versions) {
+        $size = 0;
+        $toDelete = [];  // versions we want to delete
+
+        $interval = 1;
+        $step = Storage::$max_versions_per_interval[$interval]['step'];
+        if (Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] === -1) {
+            $nextInterval = -1;
+        } else {
+            $nextInterval = $time - Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'];
+        }
+
+        $firstVersion = reset($versions);
+        $firstKey = key($versions);
+        $prevTimestamp = $firstVersion['version'];
+        $nextVersion = $firstVersion['version'] - $step;
+        unset($versions[$firstKey]);
+
+        foreach ($versions as $key => $version) {
+            $newInterval = true;
+            while ($newInterval) {
+                if ($nextInterval === -1 || $prevTimestamp > $nextInterval) {
+                    if ($version['version'] > $nextVersion) {
+                        //distance between two version too small, mark to delete
+                        $toDelete[$key] = $version['path'] . '.v' . $version['version'];
+                        $size += $version['size'];
+                        \OC::$server->getLogger()->info('Mark to expire '. $version['path'] .' next version should be ' . $nextVersion . " or smaller. (prevTimestamp: " . $prevTimestamp . "; step: " . $step, ['app' => 'files_versions']);
+                    } else {
+                        $nextVersion = $version['version'] - $step;
+                        $prevTimestamp = $version['version'];
+                    }
+                    $newInterval = false; // version checked so we can move to the next one
+                } else { // time to move on to the next interval
+                    $interval++;
+                    $step = Storage::$max_versions_per_interval[$interval]['step'];
+                    $nextVersion = $prevTimestamp - $step;
+                    if (Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] === -1) {
+                        $nextInterval = -1;
+                    } else {
+                        $nextInterval = $time - Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'];
+                    }
+                    $newInterval = true; // we changed the interval -> check same version with new interval
+                }
+            }
+        }
+
+        return [$toDelete, $size];
+    }
+
+    /**
+     * Schedule versions expiration for the given file
+     *
+     * @param string $uid owner of the file
+     * @param string $fileName file/folder for which to schedule expiration
+     */
+    public static function scheduleExpire($uid, $fileName) {
+        // let the admin disable auto expire
+        $expiration = self::getExpiration();
+        if ($expiration->isEnabled()) {
+            $command = new Expire($uid, $fileName);
+            \OC::$server->getCommandBus()->push($command);
+        }
+    }
+
+    /**
+     * Expire versions which exceed the quota.
+     *
+     * This will setup the filesystem for the given user but will not
+     * tear it down afterwards.
+     *
+     * @param string $filename path to file to expire
+     * @param string $uid user for which to expire the version
+     * @return bool|int|null
+     */
+    public static function expire($filename, $uid) {
+        $expiration = self::getExpiration();
+
+        if ($expiration->isEnabled()) {
+            // get available disk space for user
+            $user = \OC::$server->getUserManager()->get($uid);
+            if (is_null($user)) {
+                \OC::$server->getLogger()->error('Backends provided no user object for ' . $uid, ['app' => 'files_versions']);
+                throw new \OC\User\NoUserException('Backends provided no user object for ' . $uid);
+            }
+
+            \OC_Util::setupFS($uid);
+
+            if (!Filesystem::file_exists($filename)) {
+                return false;
+            }
+
+            if (empty($filename)) {
+                // file maybe renamed or deleted
+                return false;
+            }
+            $versionsFileview = new View('/'.$uid.'/files_versions');
+
+            $softQuota = true;
+            $quota = $user->getQuota();
+            if ( $quota === null || $quota === 'none' ) {
+                $quota = Filesystem::free_space('/');
+                $softQuota = false;
+            } else {
+                $quota = \OCP\Util::computerFileSize($quota);
+            }
+
+            // make sure that we have the current size of the version history
+            $versionsSize = self::getVersionsSize($uid);
+
+            // calculate available space for version history
+            // subtract size of files and current versions size from quota
+            if ($quota >= 0) {
+                if ($softQuota) {
+                    $userFolder = \OC::$server->getUserFolder($uid);
+                    if(is_null($userFolder)) {
+                        $availableSpace = 0;
+                    } else {
+                        $free = $quota - $userFolder->getSize(false); // remaining free space for user
+                        if ($free > 0) {
+                            $availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $versionsSize; // how much space can be used for versions
+                        } else {
+                            $availableSpace = $free - $versionsSize;
+                        }
+                    }
+                } else {
+                    $availableSpace = $quota;
+                }
+            } else {
+                $availableSpace = PHP_INT_MAX;
+            }
+
+            $allVersions = Storage::getVersions($uid, $filename);
+
+            $time = time();
+            list($toDelete, $sizeOfDeletedVersions) = self::getExpireList($time, $allVersions, $availableSpace <= 0);
+
+            $availableSpace = $availableSpace + $sizeOfDeletedVersions;
+            $versionsSize = $versionsSize - $sizeOfDeletedVersions;
+
+            // if still not enough free space we rearrange the versions from all files
+            if ($availableSpace <= 0) {
+                $result = Storage::getAllVersions($uid);
+                $allVersions = $result['all'];
+
+                foreach ($result['by_file'] as $versions) {
+                    list($toDeleteNew, $size) = self::getExpireList($time, $versions, $availableSpace <= 0);
+                    $toDelete = array_merge($toDelete, $toDeleteNew);
+                    $sizeOfDeletedVersions += $size;
+                }
+                $availableSpace = $availableSpace + $sizeOfDeletedVersions;
+                $versionsSize = $versionsSize - $sizeOfDeletedVersions;
+            }
+
+            $logger = \OC::$server->getLogger();
+            foreach($toDelete as $key => $path) {
+                \OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $path, 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
+                self::deleteVersion($versionsFileview, $path);
+                \OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $path, 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
+                unset($allVersions[$key]); // update array with the versions we keep
+                $logger->info('Expire: ' . $path, ['app' => 'files_versions']);
+            }
+
+            // Check if enough space is available after versions are rearranged.
+            // If not we delete the oldest versions until we meet the size limit for versions,
+            // but always keep the two latest versions
+            $numOfVersions = count($allVersions) -2 ;
+            $i = 0;
+            // sort oldest first and make sure that we start at the first element
+            ksort($allVersions);
+            reset($allVersions);
+            while ($availableSpace < 0 && $i < $numOfVersions) {
+                $version = current($allVersions);
+                \OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
+                self::deleteVersion($versionsFileview, $version['path'] . '.v' . $version['version']);
+                \OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
+                \OC::$server->getLogger()->info('running out of space! Delete oldest version: ' . $version['path'].'.v'.$version['version'], ['app' => 'files_versions']);
+                $versionsSize -= $version['size'];
+                $availableSpace += $version['size'];
+                next($allVersions);
+                $i++;
+            }
+
+            return $versionsSize; // finally return the new size of the version history
+        }
+
+        return false;
+    }
+
+    /**
+     * Create recursively missing directories inside of files_versions
+     * that match the given path to a file.
+     *
+     * @param string $filename $path to a file, relative to the user's
+     * "files" folder
+     * @param View $view view on data/user/
+     */
+    public static function createMissingDirectories($filename, $view) {
+        $dirname = Filesystem::normalizePath(dirname($filename));
+        $dirParts = explode('/', $dirname);
+        $dir = "/files_versions";
+        foreach ($dirParts as $part) {
+            $dir = $dir . '/' . $part;
+            if (!$view->file_exists($dir)) {
+                $view->mkdir($dir);
+            }
+        }
+    }
+
+    /**
+     * Static workaround
+     * @return Expiration
+     */
+    protected static function getExpiration() {
+        if (self::$application === null) {
+            self::$application = \OC::$server->query(Application::class);
+        }
+        return self::$application->getContainer()->query(Expiration::class);
+    }
 
 }

Spacing +62 added lines, -62 removed lines

@@ -58,8 +58,8 @@ 
 
 class Storage {
 
-	const DEFAULTENABLED=true;
-	const DEFAULTMAXSIZE=50; // unit: percentage; 50% of available disk space/quota
+	const DEFAULTENABLED = true;
+	const DEFAULTMAXSIZE = 50; // unit: percentage; 50% of available disk space/quota
 	const VERSIONS_ROOT = 'files_versions/';
 
 	const DELETE_TRIGGER_MASTER_REMOVED = 0;
@@ -73,17 +73,17 @@ 
 
 	private static $max_versions_per_interval = [
 		//first 10sec, one version every 2sec
-		1 => ['intervalEndsAfter' => 10,      'step' => 2],
+		1 => ['intervalEndsAfter' => 10, 'step' => 2],
 		//next minute, one version every 10sec
-		2 => ['intervalEndsAfter' => 60,      'step' => 10],
+		2 => ['intervalEndsAfter' => 60, 'step' => 10],
 		//next hour, one version every minute
-		3 => ['intervalEndsAfter' => 3600,    'step' => 60],
+		3 => ['intervalEndsAfter' => 3600, 'step' => 60],
 		//next 24h, one version every hour
-		4 => ['intervalEndsAfter' => 86400,   'step' => 3600],
+		4 => ['intervalEndsAfter' => 86400, 'step' => 3600],
 		//next 30days, one version per day
 		5 => ['intervalEndsAfter' => 2592000, 'step' => 86400],
 		//until the end one version per week
-		6 => ['intervalEndsAfter' => -1,      'step' => 604800],
+		6 => ['intervalEndsAfter' => -1, 'step' => 604800],
 	];
 
 	/** @var \OCA\Files_Versions\AppInfo\Application */
@@ -107,7 +107,7 @@ 
 			$uid = User::getUser();
 		}
 		Filesystem::initMountPoints($uid);
-		if ( $uid !== User::getUser() ) {
+		if ($uid !== User::getUser()) {
 			$info = Filesystem::getFileInfo($filename);
 			$ownerView = new View('/'.$uid.'/files');
 			try {
@@ -157,7 +157,7 @@ 
 	 * @return int versions size
 	 */
 	private static function getVersionsSize($user) {
-		$view = new View('/' . $user);
+		$view = new View('/'.$user);
 		$fileInfo = $view->getFileInfo('/files_versions');
 		return isset($fileInfo['size']) ? $fileInfo['size'] : 0;
 	}
@@ -175,13 +175,13 @@ 
 		}
 
 		// we only handle existing files
-		if (! Filesystem::file_exists($filename) || Filesystem::is_dir($filename)) {
+		if (!Filesystem::file_exists($filename) || Filesystem::is_dir($filename)) {
 			return false;
 		}
 
 		list($uid, $filename) = self::getUidAndFilename($filename);
 
-		$files_view = new View('/'.$uid .'/files');
+		$files_view = new View('/'.$uid.'/files');
 
 		$eventDispatcher = \OC::$server->getEventDispatcher();
 		$fileInfo = $files_view->getFileInfo($filename);
@@ -248,14 +248,14 @@ 
 
 		if (!Filesystem::file_exists($path)) {
 
-			$view = new View('/' . $uid . '/files_versions');
+			$view = new View('/'.$uid.'/files_versions');
 
 			$versions = self::getVersions($uid, $filename);
 			if (!empty($versions)) {
 				foreach ($versions as $v) {
-					\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $path . $v['version'], 'trigger' => self::DELETE_TRIGGER_MASTER_REMOVED]);
-					self::deleteVersion($view, $filename . '.v' . $v['version']);
-					\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $path . $v['version'], 'trigger' => self::DELETE_TRIGGER_MASTER_REMOVED]);
+					\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $path.$v['version'], 'trigger' => self::DELETE_TRIGGER_MASTER_REMOVED]);
+					self::deleteVersion($view, $filename.'.v'.$v['version']);
+					\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $path.$v['version'], 'trigger' => self::DELETE_TRIGGER_MASTER_REMOVED]);
 				}
 			}
 		}
@@ -289,33 +289,33 @@ 
 		$rootView = new View('');
 
 		// did we move a directory ?
-		if ($rootView->is_dir('/' . $targetOwner . '/files/' . $targetPath)) {
+		if ($rootView->is_dir('/'.$targetOwner.'/files/'.$targetPath)) {
 			// does the directory exists for versions too ?
-			if ($rootView->is_dir('/' . $sourceOwner . '/files_versions/' . $sourcePath)) {
+			if ($rootView->is_dir('/'.$sourceOwner.'/files_versions/'.$sourcePath)) {
 				// create missing dirs if necessary
-				self::createMissingDirectories($targetPath, new View('/'. $targetOwner));
+				self::createMissingDirectories($targetPath, new View('/'.$targetOwner));
 
 				// move the directory containing the versions
 				$rootView->$operation(
-					'/' . $sourceOwner . '/files_versions/' . $sourcePath,
-					'/' . $targetOwner . '/files_versions/' . $targetPath
+					'/'.$sourceOwner.'/files_versions/'.$sourcePath,
+					'/'.$targetOwner.'/files_versions/'.$targetPath
 				);
 			}
-		} else if ($versions = Storage::getVersions($sourceOwner, '/' . $sourcePath)) {
+		} else if ($versions = Storage::getVersions($sourceOwner, '/'.$sourcePath)) {
 			// create missing dirs if necessary
-			self::createMissingDirectories($targetPath, new View('/'. $targetOwner));
+			self::createMissingDirectories($targetPath, new View('/'.$targetOwner));
 
 			foreach ($versions as $v) {
 				// move each version one by one to the target directory
 				$rootView->$operation(
-					'/' . $sourceOwner . '/files_versions/' . $sourcePath.'.v' . $v['version'],
-					'/' . $targetOwner . '/files_versions/' . $targetPath.'.v'.$v['version']
+					'/'.$sourceOwner.'/files_versions/'.$sourcePath.'.v'.$v['version'],
+					'/'.$targetOwner.'/files_versions/'.$targetPath.'.v'.$v['version']
 				);
 			}
 		}
 
 		// if we moved versions directly for a file, schedule expiration check for that file
-		if (!$rootView->is_dir('/' . $targetOwner . '/files/' . $targetPath)) {
+		if (!$rootView->is_dir('/'.$targetOwner.'/files/'.$targetPath)) {
 			self::scheduleExpire($targetOwner, $targetPath);
 		}
 
@@ -331,13 +331,13 @@ 
 	public static function rollback(string $file, int $revision, IUser $user) {
 
 		// add expected leading slash
-		$filename = '/' . ltrim($file, '/');
+		$filename = '/'.ltrim($file, '/');
 
 		// Fetch the userfolder to trigger view hooks
 		$userFolder = \OC::$server->getUserFolder($user->getUID());
 
 		$users_view = new View('/'.$user->getUID());
-		$files_view = new View('/'. $user->getUID().'/files');
+		$files_view = new View('/'.$user->getUID().'/files');
 
 		$versionCreated = false;
 
@@ -355,7 +355,7 @@ 
 			$versionCreated = true;
 		}
 
-		$fileToRestore =  'files_versions' . $filename . '.v' . $revision;
+		$fileToRestore = 'files_versions'.$filename.'.v'.$revision;
 
 		// Restore encrypted version of the old file for the newly restored file
 		// This has to happen manually here since the file is manually copied below
@@ -371,7 +371,7 @@ 
 		);
 
 		// rollback
-		if (self::copyFileContents($users_view, $fileToRestore, 'files' . $filename)) {
+		if (self::copyFileContents($users_view, $fileToRestore, 'files'.$filename)) {
 			$files_view->touch($file, $revision);
 			Storage::scheduleExpire($user->getUID(), $file);
 
@@ -444,12 +444,12 @@ 
 			return $versions;
 		}
 		// fetch for old versions
-		$view = new View('/' . $uid . '/');
+		$view = new View('/'.$uid.'/');
 
 		$pathinfo = pathinfo($filename);
 		$versionedFile = $pathinfo['basename'];
 
-		$dir = Filesystem::normalizePath(self::VERSIONS_ROOT . '/' . $pathinfo['dirname']);
+		$dir = Filesystem::normalizePath(self::VERSIONS_ROOT.'/'.$pathinfo['dirname']);
 
 		$dirContent = false;
 		if ($view->is_dir($dir)) {
@@ -469,7 +469,7 @@ 
 						$pathparts = pathinfo($entryName);
 						$timestamp = substr($pathparts['extension'], 1);
 						$filename = $pathparts['filename'];
-						$key = $timestamp . '#' . $filename;
+						$key = $timestamp.'#'.$filename;
 						$versions[$key]['version'] = $timestamp;
 						$versions[$key]['humanReadableTimestamp'] = self::getHumanReadableTimestamp($timestamp);
 						if (empty($userFullPath)) {
@@ -477,9 +477,9 @@ 
 						} else {
 							$versions[$key]['preview'] = \OC::$server->getURLGenerator('files_version.Preview.getPreview', ['file' => $userFullPath, 'version' => $timestamp]);
 						}
-						$versions[$key]['path'] = Filesystem::normalizePath($pathinfo['dirname'] . '/' . $filename);
+						$versions[$key]['path'] = Filesystem::normalizePath($pathinfo['dirname'].'/'.$filename);
 						$versions[$key]['name'] = $versionedFile;
-						$versions[$key]['size'] = $view->filesize($dir . '/' . $entryName);
+						$versions[$key]['size'] = $view->filesize($dir.'/'.$entryName);
 						$versions[$key]['mimetype'] = \OC::$server->getMimeTypeDetector()->detectPath($versionedFile);
 					}
 				}
@@ -507,7 +507,7 @@ 
 
 		$toDelete = [];
 		foreach (array_reverse($versions['all']) as $key => $version) {
-			if ((int)$version['version'] <$threshold) {
+			if ((int) $version['version'] < $threshold) {
 				$toDelete[$key] = $version;
 			} else {
 				//Versions are sorted by time - nothing mo to iterate.
@@ -515,11 +515,11 @@ 
 			}
 		}
 
-		$view = new View('/' . $uid . '/files_versions');
+		$view = new View('/'.$uid.'/files_versions');
 		if (!empty($toDelete)) {
 			foreach ($toDelete as $version) {
 				\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT]);
-				self::deleteVersion($view, $version['path'] . '.v' . $version['version']);
+				self::deleteVersion($view, $version['path'].'.v'.$version['version']);
 				\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT]);
 			}
 		}
@@ -535,19 +535,19 @@ 
 		$diff = time() - $timestamp;
 
 		if ($diff < 60) { // first minute
-			return  $diff . " seconds ago";
+			return  $diff." seconds ago";
 		} elseif ($diff < 3600) { //first hour
-			return round($diff / 60) . " minutes ago";
+			return round($diff / 60)." minutes ago";
 		} elseif ($diff < 86400) { // first day
-			return round($diff / 3600) . " hours ago";
+			return round($diff / 3600)." hours ago";
 		} elseif ($diff < 604800) { //first week
-			return round($diff / 86400) . " days ago";
+			return round($diff / 86400)." days ago";
 		} elseif ($diff < 2419200) { //first month
-			return round($diff / 604800) . " weeks ago";
+			return round($diff / 604800)." weeks ago";
 		} elseif ($diff < 29030400) { // first year
-			return round($diff / 2419200) . " months ago";
+			return round($diff / 2419200)." months ago";
 		} else {
-			return round($diff / 29030400) . " years ago";
+			return round($diff / 29030400)." years ago";
 		}
 
 	}
@@ -558,7 +558,7 @@ 
 	 * @return array with contains two arrays 'all' which contains all versions sorted by age and 'by_file' which contains all versions sorted by filename
 	 */
 	private static function getAllVersions($uid) {
-		$view = new View('/' . $uid . '/');
+		$view = new View('/'.$uid.'/');
 		$dirs = [self::VERSIONS_ROOT];
 		$versions = [];
 
@@ -568,7 +568,7 @@ 
 
 			foreach ($files as $file) {
 				$fileData = $file->getData();
-				$filePath = $dir . '/' . $fileData['name'];
+				$filePath = $dir.'/'.$fileData['name'];
 				if ($file['type'] === 'dir') {
 					$dirs[] = $filePath;
 				} else {
@@ -576,7 +576,7 @@ 
 					$relPathStart = strlen(self::VERSIONS_ROOT);
 					$version = substr($filePath, $versionsBegin + 2);
 					$relpath = substr($filePath, $relPathStart, $versionsBegin - $relPathStart);
-					$key = $version . '#' . $relpath;
+					$key = $version.'#'.$relpath;
 					$versions[$key] = ['path' => $relpath, 'timestamp' => $version];
 				}
 			}
@@ -617,13 +617,13 @@ 
 			list($toDelete, $size) = self::getAutoExpireList($time, $versions);
 		} else {
 			$size = 0;
-			$toDelete = [];  // versions we want to delete
+			$toDelete = []; // versions we want to delete
 		}
 
 		foreach ($versions as $key => $version) {
 			if ($expiration->isExpired($version['version'], $quotaExceeded) && !isset($toDelete[$key])) {
 				$size += $version['size'];
-				$toDelete[$key] = $version['path'] . '.v' . $version['version'];
+				$toDelete[$key] = $version['path'].'.v'.$version['version'];
 			}
 		}
 
@@ -638,7 +638,7 @@ 
 	 */
 	protected static function getAutoExpireList($time, $versions) {
 		$size = 0;
-		$toDelete = [];  // versions we want to delete
+		$toDelete = []; // versions we want to delete
 
 		$interval = 1;
 		$step = Storage::$max_versions_per_interval[$interval]['step'];
@@ -660,9 +660,9 @@ 
 				if ($nextInterval === -1 || $prevTimestamp > $nextInterval) {
 					if ($version['version'] > $nextVersion) {
 						//distance between two version too small, mark to delete
-						$toDelete[$key] = $version['path'] . '.v' . $version['version'];
+						$toDelete[$key] = $version['path'].'.v'.$version['version'];
 						$size += $version['size'];
-						\OC::$server->getLogger()->info('Mark to expire '. $version['path'] .' next version should be ' . $nextVersion . " or smaller. (prevTimestamp: " . $prevTimestamp . "; step: " . $step, ['app' => 'files_versions']);
+						\OC::$server->getLogger()->info('Mark to expire '.$version['path'].' next version should be '.$nextVersion." or smaller. (prevTimestamp: ".$prevTimestamp."; step: ".$step, ['app' => 'files_versions']);
 					} else {
 						$nextVersion = $version['version'] - $step;
 						$prevTimestamp = $version['version'];
@@ -717,8 +717,8 @@ 
 			// get available disk space for user
 			$user = \OC::$server->getUserManager()->get($uid);
 			if (is_null($user)) {
-				\OC::$server->getLogger()->error('Backends provided no user object for ' . $uid, ['app' => 'files_versions']);
-				throw new \OC\User\NoUserException('Backends provided no user object for ' . $uid);
+				\OC::$server->getLogger()->error('Backends provided no user object for '.$uid, ['app' => 'files_versions']);
+				throw new \OC\User\NoUserException('Backends provided no user object for '.$uid);
 			}
 
 			\OC_Util::setupFS($uid);
@@ -735,7 +735,7 @@ 
 
 			$softQuota = true;
 			$quota = $user->getQuota();
-			if ( $quota === null || $quota === 'none' ) {
+			if ($quota === null || $quota === 'none') {
 				$quota = Filesystem::free_space('/');
 				$softQuota = false;
 			} else {
@@ -750,7 +750,7 @@ 
 			if ($quota >= 0) {
 				if ($softQuota) {
 					$userFolder = \OC::$server->getUserFolder($uid);
-					if(is_null($userFolder)) {
+					if (is_null($userFolder)) {
 						$availableSpace = 0;
 					} else {
 						$free = $quota - $userFolder->getSize(false); // remaining free space for user
@@ -790,18 +790,18 @@ 
 			}
 
 			$logger = \OC::$server->getLogger();
-			foreach($toDelete as $key => $path) {
+			foreach ($toDelete as $key => $path) {
 				\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $path, 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
 				self::deleteVersion($versionsFileview, $path);
 				\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $path, 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
 				unset($allVersions[$key]); // update array with the versions we keep
-				$logger->info('Expire: ' . $path, ['app' => 'files_versions']);
+				$logger->info('Expire: '.$path, ['app' => 'files_versions']);
 			}
 
 			// Check if enough space is available after versions are rearranged.
 			// If not we delete the oldest versions until we meet the size limit for versions,
 			// but always keep the two latest versions
-			$numOfVersions = count($allVersions) -2 ;
+			$numOfVersions = count($allVersions) - 2;
 			$i = 0;
 			// sort oldest first and make sure that we start at the first element
 			ksort($allVersions);
@@ -809,9 +809,9 @@ 
 			while ($availableSpace < 0 && $i < $numOfVersions) {
 				$version = current($allVersions);
 				\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
-				self::deleteVersion($versionsFileview, $version['path'] . '.v' . $version['version']);
+				self::deleteVersion($versionsFileview, $version['path'].'.v'.$version['version']);
 				\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
-				\OC::$server->getLogger()->info('running out of space! Delete oldest version: ' . $version['path'].'.v'.$version['version'], ['app' => 'files_versions']);
+				\OC::$server->getLogger()->info('running out of space! Delete oldest version: '.$version['path'].'.v'.$version['version'], ['app' => 'files_versions']);
 				$versionsSize -= $version['size'];
 				$availableSpace += $version['size'];
 				next($allVersions);
@@ -837,7 +837,7 @@ 
 		$dirParts = explode('/', $dirname);
 		$dir = "/files_versions";
 		foreach ($dirParts as $part) {
-			$dir = $dir . '/' . $part;
+			$dir = $dir.'/'.$part;
 			if (!$view->file_exists($dir)) {
 				$view->mkdir($dir);
 			}

apps/files_versions/lib/Expiration.php

Indentation +169 added lines, -169 removed lines

@@ -29,173 +29,173 @@
 
 class Expiration {
 
-	// how long do we keep files a version if no other value is defined in the config file (unit: days)
-	const NO_OBLIGATION = -1;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/** @var string */
-	private $retentionObligation;
-
-	/** @var int */
-	private $minAge;
-
-	/** @var int */
-	private $maxAge;
-
-	/** @var bool */
-	private $canPurgeToSaveSpace;
-
-	public function __construct(IConfig $config,ITimeFactory $timeFactory) {
-		$this->timeFactory = $timeFactory;
-		$this->retentionObligation = $config->getSystemValue('versions_retention_obligation', 'auto');
-
-		if ($this->retentionObligation !== 'disabled') {
-			$this->parseRetentionObligation();
-		}
-	}
-
-	/**
-	 * Is versions expiration enabled
-	 * @return bool
-	 */
-	public function isEnabled() {
-		return $this->retentionObligation !== 'disabled';
-	}
-
-	/**
-	 * Is default expiration active
-	 */
-	public function shouldAutoExpire() {
-		return $this->minAge === self::NO_OBLIGATION
-				|| $this->maxAge === self::NO_OBLIGATION;
-	}
-
-	/**
-	 * Check if given timestamp in expiration range
-	 * @param int $timestamp
-	 * @param bool $quotaExceeded
-	 * @return bool
-	 */
-	public function isExpired($timestamp, $quotaExceeded = false) {
-		// No expiration if disabled
-		if (!$this->isEnabled()) {
-			return false;
-		}
-
-		// Purge to save space (if allowed)
-		if ($quotaExceeded && $this->canPurgeToSaveSpace) {
-			return true;
-		}
-
-		$time = $this->timeFactory->getTime();
-		// Never expire dates in future e.g. misconfiguration or negative time
-		// adjustment
-		if ($time<$timestamp) {
-			return false;
-		}
-
-		// Purge as too old
-		if ($this->maxAge !== self::NO_OBLIGATION) {
-			$maxTimestamp = $time - ($this->maxAge * 86400);
-			$isOlderThanMax = $timestamp < $maxTimestamp;
-		} else {
-			$isOlderThanMax = false;
-		}
-
-		if ($this->minAge !== self::NO_OBLIGATION) {
-			// older than Min obligation and we are running out of quota?
-			$minTimestamp = $time - ($this->minAge * 86400);
-			$isMinReached = ($timestamp < $minTimestamp) && $quotaExceeded;
-		} else {
-			$isMinReached = false;
-		}
-
-		return $isOlderThanMax || $isMinReached;
-	}
-
-	/**
-	 * Get maximal retention obligation as a timestamp
-	 * @return int
-	 */
-	public function getMaxAgeAsTimestamp() {
-		$maxAge = false;
-		if ($this->isEnabled() && $this->maxAge !== self::NO_OBLIGATION) {
-			$time = $this->timeFactory->getTime();
-			$maxAge = $time - ($this->maxAge * 86400);
-		}
-		return $maxAge;
-	}
-
-	/**
-	 * Read versions_retention_obligation, validate it 
-	 * and set private members accordingly
-	 */
-	private function parseRetentionObligation() {
-		$splitValues = explode(',', $this->retentionObligation);
-		if (!isset($splitValues[0])) {
-			$minValue = 'auto';
-		} else {
-			$minValue = trim($splitValues[0]);
-		}
-
-		if (!isset($splitValues[1])) {
-			$maxValue = 'auto';
-		} else {
-			$maxValue = trim($splitValues[1]);
-		}
-
-		$isValid = true;
-		// Validate
-		if (!ctype_digit($minValue) && $minValue !== 'auto') {
-			$isValid = false;
-			\OC::$server->getLogger()->warning(
-					$minValue . ' is not a valid value for minimal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
-					['app'=>'files_versions']
-			);
-		}
-
-		if (!ctype_digit($maxValue) && $maxValue !== 'auto') {
-			$isValid = false;
-			\OC::$server->getLogger()->warning(
-					$maxValue . ' is not a valid value for maximal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
-					['app'=>'files_versions']
-			);
-		}
-
-		if (!$isValid){
-			$minValue = 'auto';
-			$maxValue = 'auto';
-		}
-
-
-		if ($minValue === 'auto' && $maxValue === 'auto') {
-			// Default: Delete anytime if space needed
-			$this->minAge = self::NO_OBLIGATION;
-			$this->maxAge = self::NO_OBLIGATION;
-			$this->canPurgeToSaveSpace = true;
-		} elseif ($minValue !== 'auto' && $maxValue === 'auto') {
-			// Keep for X days but delete anytime if space needed
-			$this->minAge = (int)$minValue;
-			$this->maxAge = self::NO_OBLIGATION;
-			$this->canPurgeToSaveSpace = true;
-		} elseif ($minValue === 'auto' && $maxValue !== 'auto') {
-			// Delete anytime if space needed, Delete all older than max automatically
-			$this->minAge = self::NO_OBLIGATION;
-			$this->maxAge = (int)$maxValue;
-			$this->canPurgeToSaveSpace = true;
-		} elseif ($minValue !== 'auto' && $maxValue !== 'auto') {
-			// Delete all older than max OR older than min if space needed
-
-			// Max < Min as per https://github.com/owncloud/core/issues/16301
-			if ($maxValue < $minValue) {
-				$maxValue = $minValue;
-			}
-
-			$this->minAge = (int)$minValue;
-			$this->maxAge = (int)$maxValue;
-			$this->canPurgeToSaveSpace = false;
-		}
-	}
+    // how long do we keep files a version if no other value is defined in the config file (unit: days)
+    const NO_OBLIGATION = -1;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /** @var string */
+    private $retentionObligation;
+
+    /** @var int */
+    private $minAge;
+
+    /** @var int */
+    private $maxAge;
+
+    /** @var bool */
+    private $canPurgeToSaveSpace;
+
+    public function __construct(IConfig $config,ITimeFactory $timeFactory) {
+        $this->timeFactory = $timeFactory;
+        $this->retentionObligation = $config->getSystemValue('versions_retention_obligation', 'auto');
+
+        if ($this->retentionObligation !== 'disabled') {
+            $this->parseRetentionObligation();
+        }
+    }
+
+    /**
+     * Is versions expiration enabled
+     * @return bool
+     */
+    public function isEnabled() {
+        return $this->retentionObligation !== 'disabled';
+    }
+
+    /**
+     * Is default expiration active
+     */
+    public function shouldAutoExpire() {
+        return $this->minAge === self::NO_OBLIGATION
+                || $this->maxAge === self::NO_OBLIGATION;
+    }
+
+    /**
+     * Check if given timestamp in expiration range
+     * @param int $timestamp
+     * @param bool $quotaExceeded
+     * @return bool
+     */
+    public function isExpired($timestamp, $quotaExceeded = false) {
+        // No expiration if disabled
+        if (!$this->isEnabled()) {
+            return false;
+        }
+
+        // Purge to save space (if allowed)
+        if ($quotaExceeded && $this->canPurgeToSaveSpace) {
+            return true;
+        }
+
+        $time = $this->timeFactory->getTime();
+        // Never expire dates in future e.g. misconfiguration or negative time
+        // adjustment
+        if ($time<$timestamp) {
+            return false;
+        }
+
+        // Purge as too old
+        if ($this->maxAge !== self::NO_OBLIGATION) {
+            $maxTimestamp = $time - ($this->maxAge * 86400);
+            $isOlderThanMax = $timestamp < $maxTimestamp;
+        } else {
+            $isOlderThanMax = false;
+        }
+
+        if ($this->minAge !== self::NO_OBLIGATION) {
+            // older than Min obligation and we are running out of quota?
+            $minTimestamp = $time - ($this->minAge * 86400);
+            $isMinReached = ($timestamp < $minTimestamp) && $quotaExceeded;
+        } else {
+            $isMinReached = false;
+        }
+
+        return $isOlderThanMax || $isMinReached;
+    }
+
+    /**
+     * Get maximal retention obligation as a timestamp
+     * @return int
+     */
+    public function getMaxAgeAsTimestamp() {
+        $maxAge = false;
+        if ($this->isEnabled() && $this->maxAge !== self::NO_OBLIGATION) {
+            $time = $this->timeFactory->getTime();
+            $maxAge = $time - ($this->maxAge * 86400);
+        }
+        return $maxAge;
+    }
+
+    /**
+     * Read versions_retention_obligation, validate it 
+     * and set private members accordingly
+     */
+    private function parseRetentionObligation() {
+        $splitValues = explode(',', $this->retentionObligation);
+        if (!isset($splitValues[0])) {
+            $minValue = 'auto';
+        } else {
+            $minValue = trim($splitValues[0]);
+        }
+
+        if (!isset($splitValues[1])) {
+            $maxValue = 'auto';
+        } else {
+            $maxValue = trim($splitValues[1]);
+        }
+
+        $isValid = true;
+        // Validate
+        if (!ctype_digit($minValue) && $minValue !== 'auto') {
+            $isValid = false;
+            \OC::$server->getLogger()->warning(
+                    $minValue . ' is not a valid value for minimal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
+                    ['app'=>'files_versions']
+            );
+        }
+
+        if (!ctype_digit($maxValue) && $maxValue !== 'auto') {
+            $isValid = false;
+            \OC::$server->getLogger()->warning(
+                    $maxValue . ' is not a valid value for maximal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
+                    ['app'=>'files_versions']
+            );
+        }
+
+        if (!$isValid){
+            $minValue = 'auto';
+            $maxValue = 'auto';
+        }
+
+
+        if ($minValue === 'auto' && $maxValue === 'auto') {
+            // Default: Delete anytime if space needed
+            $this->minAge = self::NO_OBLIGATION;
+            $this->maxAge = self::NO_OBLIGATION;
+            $this->canPurgeToSaveSpace = true;
+        } elseif ($minValue !== 'auto' && $maxValue === 'auto') {
+            // Keep for X days but delete anytime if space needed
+            $this->minAge = (int)$minValue;
+            $this->maxAge = self::NO_OBLIGATION;
+            $this->canPurgeToSaveSpace = true;
+        } elseif ($minValue === 'auto' && $maxValue !== 'auto') {
+            // Delete anytime if space needed, Delete all older than max automatically
+            $this->minAge = self::NO_OBLIGATION;
+            $this->maxAge = (int)$maxValue;
+            $this->canPurgeToSaveSpace = true;
+        } elseif ($minValue !== 'auto' && $maxValue !== 'auto') {
+            // Delete all older than max OR older than min if space needed
+
+            // Max < Min as per https://github.com/owncloud/core/issues/16301
+            if ($maxValue < $minValue) {
+                $maxValue = $minValue;
+            }
+
+            $this->minAge = (int)$minValue;
+            $this->maxAge = (int)$maxValue;
+            $this->canPurgeToSaveSpace = false;
+        }
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -47,7 +47,7 @@ 
 	/** @var bool */
 	private $canPurgeToSaveSpace;
 
-	public function __construct(IConfig $config,ITimeFactory $timeFactory) {
+	public function __construct(IConfig $config, ITimeFactory $timeFactory) {
 		$this->timeFactory = $timeFactory;
 		$this->retentionObligation = $config->getSystemValue('versions_retention_obligation', 'auto');
 
@@ -92,7 +92,7 @@ 
 		$time = $this->timeFactory->getTime();
 		// Never expire dates in future e.g. misconfiguration or negative time
 		// adjustment
-		if ($time<$timestamp) {
+		if ($time < $timestamp) {
 			return false;
 		}
 
@@ -151,7 +151,7 @@ 
 		if (!ctype_digit($minValue) && $minValue !== 'auto') {
 			$isValid = false;
 			\OC::$server->getLogger()->warning(
-					$minValue . ' is not a valid value for minimal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
+					$minValue.' is not a valid value for minimal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
 					['app'=>'files_versions']
 			);
 		}
@@ -159,12 +159,12 @@ 
 		if (!ctype_digit($maxValue) && $maxValue !== 'auto') {
 			$isValid = false;
 			\OC::$server->getLogger()->warning(
-					$maxValue . ' is not a valid value for maximal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
+					$maxValue.' is not a valid value for maximal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
 					['app'=>'files_versions']
 			);
 		}
 
-		if (!$isValid){
+		if (!$isValid) {
 			$minValue = 'auto';
 			$maxValue = 'auto';
 		}
@@ -177,13 +177,13 @@ 
 			$this->canPurgeToSaveSpace = true;
 		} elseif ($minValue !== 'auto' && $maxValue === 'auto') {
 			// Keep for X days but delete anytime if space needed
-			$this->minAge = (int)$minValue;
+			$this->minAge = (int) $minValue;
 			$this->maxAge = self::NO_OBLIGATION;
 			$this->canPurgeToSaveSpace = true;
 		} elseif ($minValue === 'auto' && $maxValue !== 'auto') {
 			// Delete anytime if space needed, Delete all older than max automatically
 			$this->minAge = self::NO_OBLIGATION;
-			$this->maxAge = (int)$maxValue;
+			$this->maxAge = (int) $maxValue;
 			$this->canPurgeToSaveSpace = true;
 		} elseif ($minValue !== 'auto' && $maxValue !== 'auto') {
 			// Delete all older than max OR older than min if space needed
@@ -193,8 +193,8 @@ 
 				$maxValue = $minValue;
 			}
 
-			$this->minAge = (int)$minValue;
-			$this->maxAge = (int)$maxValue;
+			$this->minAge = (int) $minValue;
+			$this->maxAge = (int) $maxValue;
 			$this->canPurgeToSaveSpace = false;
 		}
 	}