nextcloud / server

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');
 

config/config.sample.php

Indentation +95 added lines, -95 removed lines

@@ -41,17 +41,17 @@ 
  */
 'instanceid' => '',
 
- /**
-  * The salt used to hash all passwords, auto-generated by the Nextcloud
-  * installer. (There are also per-user salts.) If you lose this salt you lose
-  * all your passwords. This example is for documentation only, and you should
-  * never use it.
-  *
-  * @deprecated This salt is deprecated and only used for legacy-compatibility,
-  * developers should *NOT* use this value for anything nowadays.
-  *
-  * 'passwordsalt' => 'd3c944a9af095aa08f',
- */
+    /**
+     * The salt used to hash all passwords, auto-generated by the Nextcloud
+     * installer. (There are also per-user salts.) If you lose this salt you lose
+     * all your passwords. This example is for documentation only, and you should
+     * never use it.
+     *
+     * @deprecated This salt is deprecated and only used for legacy-compatibility,
+     * developers should *NOT* use this value for anything nowadays.
+     *
+     * 'passwordsalt' => 'd3c944a9af095aa08f',
+     */
 'passwordsalt' => '',
 
 /**
@@ -67,10 +67,10 @@ 
  *   ubos-raspberry-pi.local and ubos-raspberry-pi-2.local
  */
 'trusted_domains' =>
-  array (
+    array (
     'demo.example.org',
     'otherdomain.example.org',
-  ),
+    ),
 
 
 /**
@@ -242,10 +242,10 @@ 
  * IMAP (OC_User_IMAP), SMB (OC_User_SMB), and FTP (OC_User_FTP).
  */
 'user_backends' => array(
-	array(
-		'class' => 'OC_User_IMAP',
-		'arguments' => array('{imap.gmail.com:993/imap/ssl}INBOX')
-	)
+    array(
+        'class' => 'OC_User_IMAP',
+        'arguments' => array('{imap.gmail.com:993/imap/ssl}INBOX')
+    )
 ),
 
 /**
@@ -699,9 +699,9 @@ 
  * Defaults to an empty array.
  */
 'log.condition' => [
-	'shared_secret' => '57b58edb6637fe3059b3595cf9c41b9',
-	'users' => ['sample-user'],
-	'apps' => ['files'],
+    'shared_secret' => '57b58edb6637fe3059b3595cf9c41b9',
+    'users' => ['sample-user'],
+    'apps' => ['files'],
 ],
 
 /**
@@ -761,11 +761,11 @@ 
  * * iOS client    : ``https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8``
  */
 'customclient_desktop' =>
-	'https://nextcloud.com/install/#install-clients',
+    'https://nextcloud.com/install/#install-clients',
 'customclient_android' =>
-	'https://play.google.com/store/apps/details?id=com.nextcloud.client',
+    'https://play.google.com/store/apps/details?id=com.nextcloud.client',
 'customclient_ios' =>
-	'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8',
+    'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8',
 
 /**
  * Apps
@@ -789,11 +789,11 @@ 
  * indicates if a Web server can write files to that folder.
  */
 'apps_paths' => array(
-	array(
-		'path'=> '/var/www/nextcloud/apps',
-		'url' => '/apps',
-		'writable' => true,
-	),
+    array(
+        'path'=> '/var/www/nextcloud/apps',
+        'url' => '/apps',
+        'writable' => true,
+    ),
 ),
 
 /**
@@ -867,8 +867,8 @@ 
  * Defaults to ``''`` (empty string)
  */
 'preview_office_cl_parameters' =>
-	' --headless --nologo --nofirststartwizard --invisible --norestore '.
-	'--convert-to pdf --outdir ',
+    ' --headless --nologo --nofirststartwizard --invisible --norestore '.
+    '--convert-to pdf --outdir ',
 
 /**
  * Only register providers that have been explicitly enabled
@@ -915,14 +915,14 @@ 
  *  - OC\Preview\XBitmap
  */
 'enabledPreviewProviders' => array(
-	'OC\Preview\PNG',
-	'OC\Preview\JPEG',
-	'OC\Preview\GIF',
-	'OC\Preview\BMP',
-	'OC\Preview\XBitmap',
-	'OC\Preview\MP3',
-	'OC\Preview\TXT',
-	'OC\Preview\MarkDown'
+    'OC\Preview\PNG',
+    'OC\Preview\JPEG',
+    'OC\Preview\GIF',
+    'OC\Preview\BMP',
+    'OC\Preview\XBitmap',
+    'OC\Preview\MP3',
+    'OC\Preview\TXT',
+    'OC\Preview\MarkDown'
 ),
 
 /**
@@ -999,11 +999,11 @@ 
 
 /**
  * Extra SSL options to be used for configuration.
-  *
+ *
  * Defaults to an empty array.
  */
 'openssl' => array(
-	'config' => '/absolute/location/of/openssl.cnf',
+    'config' => '/absolute/location/of/openssl.cnf',
 ),
 
 /**
@@ -1057,46 +1057,46 @@ 
  * for more information.
  */
 'redis' => array(
-	'host' => 'localhost', // can also be a unix domain socket: '/tmp/redis.sock'
-	'port' => 6379,
-	'timeout' => 0.0,
-	'password' => '', // Optional, if not defined no password will be used.
-	'dbindex' => 0, // Optional, if undefined SELECT will not run and will use Redis Server's default DB Index.
+    'host' => 'localhost', // can also be a unix domain socket: '/tmp/redis.sock'
+    'port' => 6379,
+    'timeout' => 0.0,
+    'password' => '', // Optional, if not defined no password will be used.
+    'dbindex' => 0, // Optional, if undefined SELECT will not run and will use Redis Server's default DB Index.
 ),
 
 /**
  * Server details for one or more memcached servers to use for memory caching.
  */
 'memcached_servers' => array(
-	// hostname, port and optional weight. Also see:
-	// http://www.php.net/manual/en/memcached.addservers.php
-	// http://www.php.net/manual/en/memcached.addserver.php
-	array('localhost', 11211),
-	//array('other.host.local', 11211),
+    // hostname, port and optional weight. Also see:
+    // http://www.php.net/manual/en/memcached.addservers.php
+    // http://www.php.net/manual/en/memcached.addserver.php
+    array('localhost', 11211),
+    //array('other.host.local', 11211),
 ),
 
 /**
  * Connection options for memcached, see http://apprize.info/php/scaling/15.html
  */
 'memcached_options' => array(
-	// Set timeouts to 50ms
-	\Memcached::OPT_CONNECT_TIMEOUT => 50,
-	\Memcached::OPT_RETRY_TIMEOUT =>   50,
-	\Memcached::OPT_SEND_TIMEOUT =>    50,
-	\Memcached::OPT_RECV_TIMEOUT =>    50,
-	\Memcached::OPT_POLL_TIMEOUT =>    50,
+    // Set timeouts to 50ms
+    \Memcached::OPT_CONNECT_TIMEOUT => 50,
+    \Memcached::OPT_RETRY_TIMEOUT =>   50,
+    \Memcached::OPT_SEND_TIMEOUT =>    50,
+    \Memcached::OPT_RECV_TIMEOUT =>    50,
+    \Memcached::OPT_POLL_TIMEOUT =>    50,
 
-	// Enable compression
-	\Memcached::OPT_COMPRESSION =>          true,
+    // Enable compression
+    \Memcached::OPT_COMPRESSION =>          true,
 
-	// Turn on consistent hashing
-	\Memcached::OPT_LIBKETAMA_COMPATIBLE => true,
+    // Turn on consistent hashing
+    \Memcached::OPT_LIBKETAMA_COMPATIBLE => true,
 
-	// Enable Binary Protocol
-	\Memcached::OPT_BINARY_PROTOCOL =>      true,
+    // Enable Binary Protocol
+    \Memcached::OPT_BINARY_PROTOCOL =>      true,
 
-	// Binary serializer vill be enabled if the igbinary PECL module is available
-	//\Memcached::OPT_SERIALIZER => \Memcached::SERIALIZER_IGBINARY,
+    // Binary serializer vill be enabled if the igbinary PECL module is available
+    //\Memcached::OPT_SERIALIZER => \Memcached::SERIALIZER_IGBINARY,
 ),
 
 
@@ -1142,31 +1142,31 @@ 
  * One way to test is applying for a trystack account at http://trystack.org/
  */
 'objectstore' => [
-	'class' => 'OC\\Files\\ObjectStore\\Swift',
-	'arguments' => [
-		// trystack will user your facebook id as the user name
-		'username' => 'facebook100000123456789',
-		// in the trystack dashboard go to user -> settings -> API Password to
-		// generate a password
-		'password' => 'Secr3tPaSSWoRdt7',
-		// must already exist in the objectstore, name can be different
-		'container' => 'nextcloud',
-		// prefix to prepend to the fileid, default is 'oid:urn:'
-		'objectPrefix' => 'oid:urn:',
-		// create the container if it does not exist. default is false
-		'autocreate' => true,
-		// required, dev-/trystack defaults to 'RegionOne'
-		'region' => 'RegionOne',
-		// The Identity / Keystone endpoint
-		'url' => 'http://8.21.28.222:5000/v2.0',
-		// required on dev-/trystack
-		'tenantName' => 'facebook100000123456789',
-		// dev-/trystack uses swift by default, the lib defaults to 'cloudFiles'
-		// if omitted
-		'serviceName' => 'swift',
-		// The Interface / url Type, optional
-		'urlType' => 'internal'
-	],
+    'class' => 'OC\\Files\\ObjectStore\\Swift',
+    'arguments' => [
+        // trystack will user your facebook id as the user name
+        'username' => 'facebook100000123456789',
+        // in the trystack dashboard go to user -> settings -> API Password to
+        // generate a password
+        'password' => 'Secr3tPaSSWoRdt7',
+        // must already exist in the objectstore, name can be different
+        'container' => 'nextcloud',
+        // prefix to prepend to the fileid, default is 'oid:urn:'
+        'objectPrefix' => 'oid:urn:',
+        // create the container if it does not exist. default is false
+        'autocreate' => true,
+        // required, dev-/trystack defaults to 'RegionOne'
+        'region' => 'RegionOne',
+        // The Identity / Keystone endpoint
+        'url' => 'http://8.21.28.222:5000/v2.0',
+        // required on dev-/trystack
+        'tenantName' => 'facebook100000123456789',
+        // dev-/trystack uses swift by default, the lib defaults to 'cloudFiles'
+        // if omitted
+        'serviceName' => 'swift',
+        // The Interface / url Type, optional
+        'urlType' => 'internal'
+    ],
 ],
 
 
@@ -1196,8 +1196,8 @@ 
  * encryption in MySQL or specify a custom wait timeout on a cheap hoster.
  */
 'dbdriveroptions' => array(
-	PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
-	PDO::MYSQL_ATTR_INIT_COMMAND => 'SET wait_timeout = 28800'
+    PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
+    PDO::MYSQL_ATTR_INIT_COMMAND => 'SET wait_timeout = 28800'
 ),
 
 /**
@@ -1249,10 +1249,10 @@ 
  *  - pgsql (PostgreSQL)
  */
 'supportedDatabases' => array(
-	'sqlite',
-	'mysql',
-	'pgsql',
-	'oci',
+    'sqlite',
+    'mysql',
+    'pgsql',
+    'oci',
 ),
 
 /**

Spacing +4 added lines, -4 removed lines

@@ -67,7 +67,7 @@ 
  *   ubos-raspberry-pi.local and ubos-raspberry-pi-2.local
  */
 'trusted_domains' =>
-  array (
+  array(
     'demo.example.org',
     'otherdomain.example.org',
   ),
@@ -192,7 +192,7 @@ 
  *
  * Defaults to ``60*60*24*15`` seconds (15 days)
  */
-'remember_login_cookie_lifetime' => 60*60*24*15,
+'remember_login_cookie_lifetime' => 60 * 60 * 24 * 15,
 
 /**
  * The lifetime of a session after inactivity.
@@ -1118,7 +1118,7 @@ 
  *
  * Defaults to ``60*60*24`` (1 day)
  */
-'cache_chunk_gc_ttl' => 60*60*24,
+'cache_chunk_gc_ttl' => 60 * 60 * 24,
 
 /**
  * Using Object Store with Nextcloud
@@ -1426,7 +1426,7 @@ 
  * Defaults to ``60*60`` seconds (1 hour) or the php
  *             max_execution_time, whichever is higher.
  */
-'filelocking.ttl' => 60*60,
+'filelocking.ttl' => 60 * 60,
 
 /**
  * Memory caching backend for file locking

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/ICredentials.php

Indentation +24 added lines, -24 removed lines

@@ -29,30 +29,30 @@
  */
 interface ICredentials {
 
-	/**
-	 * Get the user UID
-	 *
-	 * @since 12
-	 *
-	 * @return string
-	 */
-	public function getUID();
+    /**
+     * Get the user UID
+     *
+     * @since 12
+     *
+     * @return string
+     */
+    public function getUID();
 
-	/**
-	 * Get the login name the users used to login
-	 *
-	 * @since 12
-	 *
-	 * @return string
-	 */
-	public function getLoginName();
+    /**
+     * Get the login name the users used to login
+     *
+     * @since 12
+     *
+     * @return string
+     */
+    public function getLoginName();
 
-	/**
-	 * Get the password
-	 *
-	 * @since 12
-	 *
-	 * @return string
-	 */
-	public function getPassword();
+    /**
+     * Get the password
+     *
+     * @since 12
+     *
+     * @return string
+     */
+    public function getPassword();
 }

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);
 }