nextcloud / server

lib/private/RedisFactory.php

Indentation +78 added lines, -78 removed lines

@@ -25,92 +25,92 @@
 namespace OC;
 
 class RedisFactory {
-	/** @var  \Redis */
-	private $instance;
+    /** @var  \Redis */
+    private $instance;
 
-	/** @var  SystemConfig */
-	private $config;
+    /** @var  SystemConfig */
+    private $config;
 
-	/**
-	 * RedisFactory constructor.
-	 *
-	 * @param SystemConfig $config
-	 */
-	public function __construct(SystemConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * RedisFactory constructor.
+     *
+     * @param SystemConfig $config
+     */
+    public function __construct(SystemConfig $config) {
+        $this->config = $config;
+    }
 
-	private function create() {
-		if ($config = $this->config->getValue('redis.cluster', [])) {
-			if (!class_exists('RedisCluster')) {
-				throw new \Exception('Redis Cluster support is not available');
-			}
-			// cluster config
-			if (isset($config['timeout'])) {
-				$timeout = $config['timeout'];
-			} else {
-				$timeout = null;
-			}
-			if (isset($config['read_timeout'])) {
-				$readTimeout = $config['read_timeout'];
-			} else {
-				$readTimeout = null;
-			}
-			if (isset($config['password']) && $config['password'] !== '') {
-				$this->instance = new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout, false, $config['password']);
-			} else {
-				$this->instance = new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout);
-			}
+    private function create() {
+        if ($config = $this->config->getValue('redis.cluster', [])) {
+            if (!class_exists('RedisCluster')) {
+                throw new \Exception('Redis Cluster support is not available');
+            }
+            // cluster config
+            if (isset($config['timeout'])) {
+                $timeout = $config['timeout'];
+            } else {
+                $timeout = null;
+            }
+            if (isset($config['read_timeout'])) {
+                $readTimeout = $config['read_timeout'];
+            } else {
+                $readTimeout = null;
+            }
+            if (isset($config['password']) && $config['password'] !== '') {
+                $this->instance = new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout, false, $config['password']);
+            } else {
+                $this->instance = new \RedisCluster(null, $config['seeds'], $timeout, $readTimeout);
+            }
 
-			if (isset($config['failover_mode'])) {
-				$this->instance->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, $config['failover_mode']);
-			}
-		} else {
+            if (isset($config['failover_mode'])) {
+                $this->instance->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, $config['failover_mode']);
+            }
+        } else {
 
-			$this->instance = new \Redis();
-			$config = $this->config->getValue('redis', []);
-			if (isset($config['host'])) {
-				$host = $config['host'];
-			} else {
-				$host = '127.0.0.1';
-			}
-			if (isset($config['port'])) {
-				$port = $config['port'];
-			} else if ($host[0] !== '/') {
-				$port = 6379;
-			} else {
-				$port = null;
-			}
-			if (isset($config['timeout'])) {
-				$timeout = $config['timeout'];
-			} else {
-				$timeout = 0.0; // unlimited
-			}
+            $this->instance = new \Redis();
+            $config = $this->config->getValue('redis', []);
+            if (isset($config['host'])) {
+                $host = $config['host'];
+            } else {
+                $host = '127.0.0.1';
+            }
+            if (isset($config['port'])) {
+                $port = $config['port'];
+            } else if ($host[0] !== '/') {
+                $port = 6379;
+            } else {
+                $port = null;
+            }
+            if (isset($config['timeout'])) {
+                $timeout = $config['timeout'];
+            } else {
+                $timeout = 0.0; // unlimited
+            }
 
-			$this->instance->connect($host, $port, $timeout);
-			if (isset($config['password']) && $config['password'] !== '') {
-				$this->instance->auth($config['password']);
-			}
+            $this->instance->connect($host, $port, $timeout);
+            if (isset($config['password']) && $config['password'] !== '') {
+                $this->instance->auth($config['password']);
+            }
 
-			if (isset($config['dbindex'])) {
-				$this->instance->select($config['dbindex']);
-			}
-		}
-	}
+            if (isset($config['dbindex'])) {
+                $this->instance->select($config['dbindex']);
+            }
+        }
+    }
 
-	public function getInstance() {
-		if (!$this->isAvailable()) {
-			throw new \Exception('Redis support is not available');
-		}
-		if (!$this->instance instanceof \Redis) {
-			$this->create();
-		}
+    public function getInstance() {
+        if (!$this->isAvailable()) {
+            throw new \Exception('Redis support is not available');
+        }
+        if (!$this->instance instanceof \Redis) {
+            $this->create();
+        }
 
-		return $this->instance;
-	}
+        return $this->instance;
+    }
 
-	public function isAvailable() {
-		return extension_loaded('redis')
-		&& version_compare(phpversion('redis'), '2.2.5', '>=');
-	}
+    public function isAvailable() {
+        return extension_loaded('redis')
+        && version_compare(phpversion('redis'), '2.2.5', '>=');
+    }
 }

config/config.sample.php

Indentation +135 added lines, -135 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',
-  ),
+    ),
 
 
 /**
@@ -678,10 +678,10 @@ 
  *  - www.edri.org
  */
 'connectivity_check_domains' => array(
-	'www.nextcloud.com',
-	'www.startpage.com',
-	'www.eff.org',
-	'www.edri.org'
+    'www.nextcloud.com',
+    'www.startpage.com',
+    'www.eff.org',
+    'www.edri.org'
 ),
 
 /**
@@ -797,9 +797,9 @@ 
  * Defaults to an empty array.
  */
 'log.condition' => [
-	'shared_secret' => '57b58edb6637fe3059b3595cf9c41b9',
-	'users' => ['sample-user'],
-	'apps' => ['files'],
+    'shared_secret' => '57b58edb6637fe3059b3595cf9c41b9',
+    'users' => ['sample-user'],
+    'apps' => ['files'],
 ],
 
 /**
@@ -853,18 +853,18 @@ 
  *  - iOS client app id: ``1125420102``
  */
 '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',
 'customclient_ios_appid' =>
-		'1125420102',
+        '1125420102',
 /**
- * Apps
- *
- * Options for the Apps folder, Apps store, and App code checker.
- */
+         * Apps
+         *
+         * Options for the Apps folder, Apps store, and App code checker.
+         */
 
 /**
  * When enabled, admins may install apps from the Nextcloud app store.
@@ -882,11 +882,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,
+    ),
 ),
 
 /**
@@ -951,8 +951,8 @@ 
  * Defaults to ``''`` (empty string)
  */
 'preview_office_cl_parameters' =>
-	' --headless --nologo --nofirststartwizard --invisible --norestore '.
-	'--convert-to png --outdir ',
+    ' --headless --nologo --nofirststartwizard --invisible --norestore '.
+    '--convert-to png --outdir ',
 
 /**
  * Only register providers that have been explicitly enabled
@@ -996,15 +996,15 @@ 
  *  - OC\Preview\XBitmap
  */
 'enabledPreviewProviders' => array(
-	'OC\Preview\PNG',
-	'OC\Preview\JPEG',
-	'OC\Preview\GIF',
-	'OC\Preview\HEIC',
-	'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\HEIC',
+    'OC\Preview\BMP',
+    'OC\Preview\XBitmap',
+    'OC\Preview\MP3',
+    'OC\Preview\TXT',
+    'OC\Preview\MarkDown'
 ),
 
 /**
@@ -1080,11 +1080,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',
 ),
 
 /**
@@ -1132,11 +1132,11 @@ 
  * for more information.
  */
 'redis' => [
-	'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.
 ],
 
 /**
@@ -1165,14 +1165,14 @@ 
  * https://github.com/phpredis/phpredis/commit/c5994f2a42b8a348af92d3acb4edff1328ad8ce1
  */
 'redis.cluster' => [
-	'seeds' => [ // provide some/all of the cluster servers to bootstrap discovery, port required
-		'localhost:7000',
-		'localhost:7001',
-	],
-	'timeout' => 0.0,
-	'read_timeout' => 0.0,
-	'failover_mode' => \RedisCluster::FAILOVER_ERROR,
-	'password' => '', // Optional, if not defined no password will be used.
+    'seeds' => [ // provide some/all of the cluster servers to bootstrap discovery, port required
+        'localhost:7000',
+        'localhost:7001',
+    ],
+    'timeout' => 0.0,
+    'read_timeout' => 0.0,
+    'failover_mode' => \RedisCluster::FAILOVER_ERROR,
+    'password' => '', // Optional, if not defined no password will be used.
 ],
 
 
@@ -1180,35 +1180,35 @@ 
  * 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,
 ),
 
 
@@ -1254,61 +1254,61 @@ 
  * One way to test is applying for a trystack account at http://trystack.org/
  */
 'objectstore' => [
-	'class' => 'OC\\Files\\ObjectStore\\Swift',
-	'arguments' => [
-		// trystack will use 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 use 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'
+    ],
 ],
 
 /**
  * To use swift V3
  */
 'objectstore' => [
-	'class' => 'OC\\Files\\ObjectStore\\Swift',
-	'arguments' => [
-		'autocreate' => true,
-		'user' => [
-			'name' => 'swift',
-			'password' => 'swift',
-			'domain' => [
-				'name' => 'default',
-			],
-		],
-		'scope' => [
-			'project' => [
-				'name' => 'service',
-				'domain' => [
-					'name' => 'default',
-				],
-			],
-		],
-		'tenantName' => 'service',
-		'serviceName' => 'swift',
-		'region' => 'regionOne',
-		'url' => 'http://yourswifthost:5000/v3',
-		'bucket' => 'nextcloud',
-	],
+    'class' => 'OC\\Files\\ObjectStore\\Swift',
+    'arguments' => [
+        'autocreate' => true,
+        'user' => [
+            'name' => 'swift',
+            'password' => 'swift',
+            'domain' => [
+                'name' => 'default',
+            ],
+        ],
+        'scope' => [
+            'project' => [
+                'name' => 'service',
+                'domain' => [
+                    'name' => 'default',
+                ],
+            ],
+        ],
+        'tenantName' => 'service',
+        'serviceName' => 'swift',
+        'region' => 'regionOne',
+        'url' => 'http://yourswifthost:5000/v3',
+        'bucket' => 'nextcloud',
+    ],
 ],
 
 
@@ -1348,8 +1348,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'
 ),
 
 /**
@@ -1406,10 +1406,10 @@ 
  *  - pgsql (PostgreSQL)
  */
 'supportedDatabases' => array(
-	'sqlite',
-	'mysql',
-	'pgsql',
-	'oci',
+    'sqlite',
+    'mysql',
+    'pgsql',
+    'oci',
 ),
 
 /**
@@ -1684,8 +1684,8 @@ 
  * WARNING: only use this if you know what you are doing
  */
 'csrf.optout' => array(
-	'/^WebDAVFS/', // OS X Finder
-	'/^Microsoft-WebDAV-MiniRedir/', // Windows webdav drive
+    '/^WebDAVFS/', // OS X Finder
+    '/^Microsoft-WebDAV-MiniRedir/', // Windows webdav drive
 ),
 
 /**

Spacing +5 added lines, -5 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',
   ),
@@ -230,7 +230,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.
@@ -1165,7 +1165,7 @@ 
  * https://github.com/phpredis/phpredis/commit/c5994f2a42b8a348af92d3acb4edff1328ad8ce1
  */
 'redis.cluster' => [
-	'seeds' => [ // provide some/all of the cluster servers to bootstrap discovery, port required
+	'seeds' => [// provide some/all of the cluster servers to bootstrap discovery, port required
 		'localhost:7000',
 		'localhost:7001',
 	],
@@ -1230,7 +1230,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
@@ -1598,7 +1598,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