nextcloud / server

apps/files_versions/lib/BackgroundJob/ExpireVersions.php

Indentation +52 added lines, -52 removed lines

@@ -31,66 +31,66 @@
 
 class ExpireVersions extends \OC\BackgroundJob\TimedJob {
 
-	const ITEMS_PER_SESSION = 1000;
+    const ITEMS_PER_SESSION = 1000;
 
-	/**
-	 * @var Expiration
-	 */
-	private $expiration;
+    /**
+     * @var Expiration
+     */
+    private $expiration;
 	
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
 
-	public function __construct(IUserManager $userManager = null, Expiration $expiration = null) {
-		// Run once per 30 minutes
-		$this->setInterval(60 * 30);
+    public function __construct(IUserManager $userManager = null, Expiration $expiration = null) {
+        // Run once per 30 minutes
+        $this->setInterval(60 * 30);
 
-		if (is_null($expiration) || is_null($userManager)) {
-			$this->fixDIForJobs();
-		} else {
-			$this->expiration = $expiration;
-			$this->userManager = $userManager;
-		}
-	}
+        if (is_null($expiration) || is_null($userManager)) {
+            $this->fixDIForJobs();
+        } else {
+            $this->expiration = $expiration;
+            $this->userManager = $userManager;
+        }
+    }
 
-	protected function fixDIForJobs() {
-		$application = new Application();
-		$this->expiration = $application->getContainer()->query('Expiration');
-		$this->userManager = \OC::$server->getUserManager();
-	}
+    protected function fixDIForJobs() {
+        $application = new Application();
+        $this->expiration = $application->getContainer()->query('Expiration');
+        $this->userManager = \OC::$server->getUserManager();
+    }
 
-	protected function run($argument) {
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
-		if (!$maxAge) {
-			return;
-		}
+    protected function run($argument) {
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
+        if (!$maxAge) {
+            return;
+        }
 
-		$this->userManager->callForSeenUsers(function(IUser $user) {
-			$uid = $user->getUID();
-			if (!$this->setupFS($uid)) {
-				return;
-			}
-			Storage::expireOlderThanMaxForUser($uid);
-		});
-	}
+        $this->userManager->callForSeenUsers(function(IUser $user) {
+            $uid = $user->getUID();
+            if (!$this->setupFS($uid)) {
+                return;
+            }
+            Storage::expireOlderThanMaxForUser($uid);
+        });
+    }
 
-	/**
-	 * Act on behalf on trash item owner
-	 * @param string $user
-	 * @return boolean
-	 */
-	protected function setupFS($user) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
+    /**
+     * Act on behalf on trash item owner
+     * @param string $user
+     * @return boolean
+     */
+    protected function setupFS($user) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
 
-		// Check if this user has a versions directory
-		$view = new \OC\Files\View('/' . $user);
-		if (!$view->is_dir('/files_versions')) {
-			return false;
-		}
+        // Check if this user has a versions directory
+        $view = new \OC\Files\View('/' . $user);
+        if (!$view->is_dir('/files_versions')) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 		\OC_Util::setupFS($user);
 
 		// Check if this user has a versions directory
-		$view = new \OC\Files\View('/' . $user);
+		$view = new \OC\Files\View('/'.$user);
 		if (!$view->is_dir('/files_versions')) {
 			return false;
 		}

apps/files_versions/lib/Hooks.php

Spacing +8 added lines, -8 removed lines

@@ -53,11 +53,11 @@ 
 	/**
 	 * listen to write event.
 	 */
-	public static function write_hook( $params ) {
+	public static function write_hook($params) {
 
 		if (\OCP\App::isEnabled('files_versions')) {
 			$path = $params[\OC\Files\Filesystem::signal_param_path];
-			if($path<>'') {
+			if ($path <> '') {
 				Storage::store($path);
 			}
 		}
@@ -75,7 +75,7 @@ 
 
 		if (\OCP\App::isEnabled('files_versions')) {
 			$path = $params[\OC\Files\Filesystem::signal_param_path];
-			if($path<>'') {
+			if ($path <> '') {
 				Storage::delete($path);
 			}
 		}
@@ -87,7 +87,7 @@ 
 	 */
 	public static function pre_remove_hook($params) {
 		$path = $params[\OC\Files\Filesystem::signal_param_path];
-			if($path<>'') {
+			if ($path <> '') {
 				Storage::markDeletedFile($path);
 			}
 	}
@@ -104,7 +104,7 @@ 
 		if (\OCP\App::isEnabled('files_versions')) {
 			$oldpath = $params['oldpath'];
 			$newpath = $params['newpath'];
-			if($oldpath<>'' && $newpath<>'') {
+			if ($oldpath <> '' && $newpath <> '') {
 				Storage::renameOrCopy($oldpath, $newpath, 'rename');
 			}
 		}
@@ -122,7 +122,7 @@ 
 		if (\OCP\App::isEnabled('files_versions')) {
 			$oldpath = $params['oldpath'];
 			$newpath = $params['newpath'];
-			if($oldpath<>'' && $newpath<>'') {
+			if ($oldpath <> '' && $newpath <> '') {
 				Storage::renameOrCopy($oldpath, $newpath, 'copy');
 			}
 		}
@@ -141,7 +141,7 @@ 
 
 			// if we rename a movable mount point, then the versions don't have
 			// to be renamed
-			$absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']);
+			$absOldPath = \OC\Files\Filesystem::normalizePath('/'.\OCP\User::getUser().'/files'.$params['oldpath']);
 			$manager = \OC\Files\Filesystem::getMountManager();
 			$mount = $manager->find($absOldPath);
 			$internalPath = $mount->getInternalPath($absOldPath);
@@ -149,7 +149,7 @@ 
 				return;
 			}
 
-			$view = new \OC\Files\View(\OCP\User::getUser() . '/files');
+			$view = new \OC\Files\View(\OCP\User::getUser().'/files');
 			if ($view->file_exists($params['newpath'])) {
 				Storage::store($params['newpath']);
 			} else {

Indentation +130 added lines, -130 removed lines

@@ -35,134 +35,134 @@
 
 class Hooks {
 
-	public static function connectHooks() {
-		// Listen to write signals
-		\OCP\Util::connectHook('OC_Filesystem', 'write', 'OCA\Files_Versions\Hooks', 'write_hook');
-		// Listen to delete and rename signals
-		\OCP\Util::connectHook('OC_Filesystem', 'post_delete', 'OCA\Files_Versions\Hooks', 'remove_hook');
-		\OCP\Util::connectHook('OC_Filesystem', 'delete', 'OCA\Files_Versions\Hooks', 'pre_remove_hook');
-		\OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Files_Versions\Hooks', 'rename_hook');
-		\OCP\Util::connectHook('OC_Filesystem', 'post_copy', 'OCA\Files_Versions\Hooks', 'copy_hook');
-		\OCP\Util::connectHook('OC_Filesystem', 'rename', 'OCA\Files_Versions\Hooks', 'pre_renameOrCopy_hook');
-		\OCP\Util::connectHook('OC_Filesystem', 'copy', 'OCA\Files_Versions\Hooks', 'pre_renameOrCopy_hook');
-
-		$eventDispatcher = \OC::$server->getEventDispatcher();
-		$eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', ['OCA\Files_Versions\Hooks', 'onLoadFilesAppScripts']);
-	}
-
-	/**
-	 * listen to write event.
-	 */
-	public static function write_hook( $params ) {
-
-		if (\OCP\App::isEnabled('files_versions')) {
-			$path = $params[\OC\Files\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) {
-
-		if (\OCP\App::isEnabled('files_versions')) {
-			$path = $params[\OC\Files\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[\OC\Files\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) {
-
-		if (\OCP\App::isEnabled('files_versions')) {
-			$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) {
-
-		if (\OCP\App::isEnabled('files_versions')) {
-			$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 (\OCP\App::isEnabled('files_versions')) {
-
-			// if we rename a movable mount point, then the versions don't have
-			// to be renamed
-			$absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']);
-			$manager = \OC\Files\Filesystem::getMountManager();
-			$mount = $manager->find($absOldPath);
-			$internalPath = $mount->getInternalPath($absOldPath);
-			if ($internalPath === '' and $mount instanceof \OC\Files\Mount\MoveableMount) {
-				return;
-			}
-
-			$view = new \OC\Files\View(\OCP\User::getUser() . '/files');
-			if ($view->file_exists($params['newpath'])) {
-				Storage::store($params['newpath']);
-			} else {
-				Storage::setSourcePathAndUser($params['oldpath']);
-			}
-
-		}
-	}
-
-	/**
-	 * Load additional scripts when the files app is visible
-	 */
-	public static function onLoadFilesAppScripts() {
-		\OCP\Util::addScript('files_versions', 'merged');
-	}
+    public static function connectHooks() {
+        // Listen to write signals
+        \OCP\Util::connectHook('OC_Filesystem', 'write', 'OCA\Files_Versions\Hooks', 'write_hook');
+        // Listen to delete and rename signals
+        \OCP\Util::connectHook('OC_Filesystem', 'post_delete', 'OCA\Files_Versions\Hooks', 'remove_hook');
+        \OCP\Util::connectHook('OC_Filesystem', 'delete', 'OCA\Files_Versions\Hooks', 'pre_remove_hook');
+        \OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Files_Versions\Hooks', 'rename_hook');
+        \OCP\Util::connectHook('OC_Filesystem', 'post_copy', 'OCA\Files_Versions\Hooks', 'copy_hook');
+        \OCP\Util::connectHook('OC_Filesystem', 'rename', 'OCA\Files_Versions\Hooks', 'pre_renameOrCopy_hook');
+        \OCP\Util::connectHook('OC_Filesystem', 'copy', 'OCA\Files_Versions\Hooks', 'pre_renameOrCopy_hook');
+
+        $eventDispatcher = \OC::$server->getEventDispatcher();
+        $eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', ['OCA\Files_Versions\Hooks', 'onLoadFilesAppScripts']);
+    }
+
+    /**
+     * listen to write event.
+     */
+    public static function write_hook( $params ) {
+
+        if (\OCP\App::isEnabled('files_versions')) {
+            $path = $params[\OC\Files\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) {
+
+        if (\OCP\App::isEnabled('files_versions')) {
+            $path = $params[\OC\Files\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[\OC\Files\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) {
+
+        if (\OCP\App::isEnabled('files_versions')) {
+            $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) {
+
+        if (\OCP\App::isEnabled('files_versions')) {
+            $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 (\OCP\App::isEnabled('files_versions')) {
+
+            // if we rename a movable mount point, then the versions don't have
+            // to be renamed
+            $absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']);
+            $manager = \OC\Files\Filesystem::getMountManager();
+            $mount = $manager->find($absOldPath);
+            $internalPath = $mount->getInternalPath($absOldPath);
+            if ($internalPath === '' and $mount instanceof \OC\Files\Mount\MoveableMount) {
+                return;
+            }
+
+            $view = new \OC\Files\View(\OCP\User::getUser() . '/files');
+            if ($view->file_exists($params['newpath'])) {
+                Storage::store($params['newpath']);
+            } else {
+                Storage::setSourcePathAndUser($params['oldpath']);
+            }
+
+        }
+    }
+
+    /**
+     * Load additional scripts when the files app is visible
+     */
+    public static function onLoadFilesAppScripts() {
+        \OCP\Util::addScript('files_versions', 'merged');
+    }
 }

apps/files_versions/lib/Expiration.php

Indentation +169 added lines, -169 removed lines

@@ -27,173 +27,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 = intval($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 = intval($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 = intval($minValue);
-			$this->maxAge = intval($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 = intval($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 = intval($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 = intval($minValue);
+            $this->maxAge = intval($maxValue);
+            $this->canPurgeToSaveSpace = false;
+        }
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -45,7 +45,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');
 
@@ -58,14 +58,14 @@ 
 	 * Is versions expiration enabled
 	 * @return bool
 	 */
-	public function isEnabled(){
+	public function isEnabled() {
 		return $this->retentionObligation !== 'disabled';
 	}
 
 	/**
 	 * Is default expiration active
 	 */
-	public function shouldAutoExpire(){
+	public function shouldAutoExpire() {
 		return $this->minAge === self::NO_OBLIGATION
 				|| $this->maxAge === self::NO_OBLIGATION;
 	}
@@ -76,7 +76,7 @@ 
 	 * @param bool $quotaExceeded
 	 * @return bool
 	 */
-	public function isExpired($timestamp, $quotaExceeded = false){
+	public function isExpired($timestamp, $quotaExceeded = false) {
 		// No expiration if disabled
 		if (!$this->isEnabled()) {
 			return false;
@@ -90,7 +90,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;
 		}
 
@@ -117,7 +117,7 @@ 
 	 * Get maximal retention obligation as a timestamp
 	 * @return int
 	 */
-	public function getMaxAgeAsTimestamp(){
+	public function getMaxAgeAsTimestamp() {
 		$maxAge = false;
 		if ($this->isEnabled() && $this->maxAge !== self::NO_OBLIGATION) {
 			$time = $this->timeFactory->getTime();
@@ -130,7 +130,7 @@ 
 	* Read versions_retention_obligation, validate it 
 	* and set private members accordingly
 	*/
-	private function parseRetentionObligation(){
+	private function parseRetentionObligation() {
 		$splitValues = explode(',', $this->retentionObligation);
 		if (!isset($splitValues[0])) {
 			$minValue = 'auto';
@@ -149,7 +149,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']
 			);
 		}
@@ -157,12 +157,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';
 		}

apps/files_versions/download.php

Indentation +6 added lines, -6 removed lines

@@ -32,13 +32,13 @@
 $revision=(int)$_GET['revision'];
 
 try {
-	list($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($file);
+    list($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($file);
 } catch(\OCP\Files\NotFoundException $e) {
-	header("HTTP/1.1 404 Not Found");
-	$tmpl = new OCP\Template('', '404', 'guest');
-	$tmpl->assign('file', '');
-	$tmpl->printPage();
-	exit();
+    header("HTTP/1.1 404 Not Found");
+    $tmpl = new OCP\Template('', '404', 'guest');
+    $tmpl->assign('file', '');
+    $tmpl->printPage();
+    exit();
 }
 
 $versionName = '/'.$uid.'/files_versions/'.$filename.'.v'.$revision;

Spacing +2 added lines, -2 removed lines

@@ -29,11 +29,11 @@
 OCP\JSON::checkLoggedIn();
 
 $file = $_GET['file'];
-$revision=(int)$_GET['revision'];
+$revision = (int) $_GET['revision'];
 
 try {
 	list($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($file);
-} catch(\OCP\Files\NotFoundException $e) {
+} catch (\OCP\Files\NotFoundException $e) {
 	header("HTTP/1.1 404 Not Found");
 	$tmpl = new OCP\Template('', '404', 'guest');
 	$tmpl->assign('file', '');

apps/files_versions/appinfo/routes.php

Indentation +10 added lines, -10 removed lines

@@ -31,20 +31,20 @@
 
 $application = new Application();
 $application->registerRoutes($this, [
-	'routes' => [
-		[
-			'name' => 'Preview#getPreview',
-			'url' => '/preview',
-			'verb' => 'GET',
-		],
-	],
+    'routes' => [
+        [
+            'name' => 'Preview#getPreview',
+            'url' => '/preview',
+            'verb' => 'GET',
+        ],
+    ],
 ]);
 
 /** @var $this \OCP\Route\IRouter */
 $this->create('files_versions_download', 'download.php')
-	->actionInclude('files_versions/download.php');
+    ->actionInclude('files_versions/download.php');
 $this->create('files_versions_ajax_getVersions', 'ajax/getVersions.php')
-	->actionInclude('files_versions/ajax/getVersions.php');
+    ->actionInclude('files_versions/ajax/getVersions.php');
 $this->create('files_versions_ajax_rollbackVersion', 'ajax/rollbackVersion.php')
-	->actionInclude('files_versions/ajax/rollbackVersion.php');
+    ->actionInclude('files_versions/ajax/rollbackVersion.php');
 

lib/public/Authentication/IApacheBackend.php

Indentation +21 added lines, -21 removed lines

@@ -38,28 +38,28 @@
  */
 interface IApacheBackend {
 
-	/**
-	 * In case the user has been authenticated by Apache true is returned.
-	 *
-	 * @return boolean whether Apache reports a user as currently logged in.
-	 * @since 6.0.0
-	 */
-	public function isSessionActive();
+    /**
+     * In case the user has been authenticated by Apache true is returned.
+     *
+     * @return boolean whether Apache reports a user as currently logged in.
+     * @since 6.0.0
+     */
+    public function isSessionActive();
 
-	/**
-	 * Creates an attribute which is added to the logout hyperlink. It can
-	 * supply any attribute(s) which are valid for <a>.
-	 *
-	 * @return string with one or more HTML attributes.
-	 * @since 6.0.0
-	 */
-	public function getLogoutAttribute();
+    /**
+     * Creates an attribute which is added to the logout hyperlink. It can
+     * supply any attribute(s) which are valid for <a>.
+     *
+     * @return string with one or more HTML attributes.
+     * @since 6.0.0
+     */
+    public function getLogoutAttribute();
 
-	/**
-	 * Return the id of the current user
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getCurrentUserId();
+    /**
+     * Return the id of the current user
+     * @return string
+     * @since 6.0.0
+     */
+    public function getCurrentUserId();
 
 }

lib/public/Authentication/LoginCredentials/IStore.php

Indentation +9 added lines, -9 removed lines

@@ -31,14 +31,14 @@
  */
 interface IStore {
 	
-	/**
-	 * Get login credentials of the currently logged in user
-	 *
-	 * @since 12
-	 *
-	 * @throws CredentialsUnavailableException
-	 * @return ICredentials the login credentials of the current user
-	 */
-	public function getLoginCredentials();
+    /**
+     * Get login credentials of the currently logged in user
+     *
+     * @since 12
+     *
+     * @throws CredentialsUnavailableException
+     * @return ICredentials the login credentials of the current user
+     */
+    public function getLoginCredentials();
 	
 }

lib/public/Authentication/TwoFactorAuth/IProvider.php

Indentation +55 added lines, -55 removed lines

@@ -30,64 +30,64 @@
  */
 interface IProvider {
 
-	/**
-	 * Get unique identifier of this 2FA provider
-	 *
-	 * @since 9.1.0
-	 *
-	 * @return string
-	 */
-	public function getId();
+    /**
+     * Get unique identifier of this 2FA provider
+     *
+     * @since 9.1.0
+     *
+     * @return string
+     */
+    public function getId();
 
-	/**
-	 * Get the display name for selecting the 2FA provider
-	 *
-	 * Example: "Email"
-	 *
-	 * @since 9.1.0
-	 *
-	 * @return string
-	 */
-	public function getDisplayName();
+    /**
+     * Get the display name for selecting the 2FA provider
+     *
+     * Example: "Email"
+     *
+     * @since 9.1.0
+     *
+     * @return string
+     */
+    public function getDisplayName();
 
-	/**
-	 * Get the description for selecting the 2FA provider
-	 *
-	 * Example: "Get a token via e-mail"
-	 *
-	 * @since 9.1.0
-	 *
-	 * @return string
-	 */
-	public function getDescription();
+    /**
+     * Get the description for selecting the 2FA provider
+     *
+     * Example: "Get a token via e-mail"
+     *
+     * @since 9.1.0
+     *
+     * @return string
+     */
+    public function getDescription();
 
-	/**
-	 * Get the template for rending the 2FA provider view
-	 *
-	 * @since 9.1.0
-	 *
-	 * @param IUser $user
-	 * @return Template
-	 */
-	public function getTemplate(IUser $user);
+    /**
+     * Get the template for rending the 2FA provider view
+     *
+     * @since 9.1.0
+     *
+     * @param IUser $user
+     * @return Template
+     */
+    public function getTemplate(IUser $user);
 
-	/**
-	 * Verify the given challenge
-	 *
-	 * @since 9.1.0
-	 *
-	 * @param IUser $user
-	 * @param string $challenge
-	 */
-	public function verifyChallenge(IUser $user, $challenge);
+    /**
+     * Verify the given challenge
+     *
+     * @since 9.1.0
+     *
+     * @param IUser $user
+     * @param string $challenge
+     */
+    public function verifyChallenge(IUser $user, $challenge);
 
-	/**
-	 * Decides whether 2FA is enabled for the given user
-	 *
-	 * @since 9.1.0
-	 *
-	 * @param IUser $user
-	 * @return boolean
-	 */
-	public function isTwoFactorAuthEnabledForUser(IUser $user);
+    /**
+     * Decides whether 2FA is enabled for the given user
+     *
+     * @since 9.1.0
+     *
+     * @param IUser $user
+     * @return boolean
+     */
+    public function isTwoFactorAuthEnabledForUser(IUser $user);
 }

lib/public/IHelper.php

Indentation +9 added lines, -9 removed lines

@@ -38,13 +38,13 @@
  * @deprecated 8.1.0
  */
 interface IHelper {
-	/**
-	 * Gets the content of an URL by using CURL or a fallback if it is not
-	 * installed
-	 * @param string $url the url that should be fetched
-	 * @return string the content of the webpage
-	 * @since 6.0.0
-	 * @deprecated 8.1.0 Use \OCP\IServerContainer::getHTTPClientService
-	 */
-	public function getUrlContent($url);
+    /**
+     * Gets the content of an URL by using CURL or a fallback if it is not
+     * installed
+     * @param string $url the url that should be fetched
+     * @return string the content of the webpage
+     * @since 6.0.0
+     * @deprecated 8.1.0 Use \OCP\IServerContainer::getHTTPClientService
+     */
+    public function getUrlContent($url);
 }