nextcloud / server

config/config.sample.php

Spacing +4 added lines, -4 removed lines

@@ -250,7 +250,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.
@@ -1427,7 +1427,7 @@ 
  * https://github.com/phpredis/phpredis/commit/c5994f2a42b8a348af92d3acb4edff1328ad8ce1
  */
 'redis.cluster' => [
-	'seeds' => [ // provide some or all of the cluster servers to bootstrap discovery, port required
+	'seeds' => [// provide some or all of the cluster servers to bootstrap discovery, port required
 		'localhost:7000',
 		'localhost:7001',
 	],
@@ -1501,7 +1501,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
@@ -2093,7 +2093,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

Indentation +179 added lines, -179 removed lines

@@ -47,17 +47,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' => '',
 
 /**
@@ -81,12 +81,12 @@ 
  *   Using TLS certificates where commonName=<IP address> is deprecated
  */
 'trusted_domains' =>
-   [
+    [
     'demo.example.org',
     'otherdomain.example.org',
     '10.111.112.113',
     '[2001:db8::1]'
-  ],
+    ],
 
 
 /**
@@ -161,8 +161,8 @@ 
  * Specify read only replicas to be used by Nextcloud when querying the database
  */
 'dbreplica' => [
-	['user' => 'nextcloud', 'password' => 'password1', 'host' => 'replica1', 'dbname' => ''],
-	['user' => 'nextcloud', 'password' => 'password2', 'host' => 'replica2', 'dbname' => ''],
+    ['user' => 'nextcloud', 'password' => 'password1', 'host' => 'replica1', 'dbname' => ''],
+    ['user' => 'nextcloud', 'password' => 'password2', 'host' => 'replica2', 'dbname' => ''],
 ],
 
 /**
@@ -941,10 +941,10 @@ 
  *  - https://www.edri.org
  */
 'connectivity_check_domains' => [
-	'https://www.nextcloud.com',
-	'https://www.startpage.com',
-	'https://www.eff.org',
-	'https://www.edri.org'
+    'https://www.nextcloud.com',
+    'https://www.startpage.com',
+    'https://www.eff.org',
+    'https://www.edri.org'
 ],
 
 /**
@@ -1106,18 +1106,18 @@ 
  * Defaults to an empty array.
  */
 'log.condition' => [
-	'shared_secret' => '57b58edb6637fe3059b3595cf9c41b9',
-	'users' => ['sample-user'],
-	'apps' => ['files'],
-	'matches' => [
-		[
-			'shared_secret' => '57b58edb6637fe3059b3595cf9c41b9',
-			'users' => ['sample-user'],
-			'apps' => ['files'],
-			'loglevel' => 1,
-			'message' => 'contains substring'
-		],
-	],
+    'shared_secret' => '57b58edb6637fe3059b3595cf9c41b9',
+    'users' => ['sample-user'],
+    'apps' => ['files'],
+    'matches' => [
+        [
+            'shared_secret' => '57b58edb6637fe3059b3595cf9c41b9',
+            'users' => ['sample-user'],
+            'apps' => ['files'],
+            'loglevel' => 1,
+            'message' => 'contains substring'
+        ],
+    ],
 ],
 
 /**
@@ -1191,20 +1191,20 @@ 
  * - F-Droid client: ``https://f-droid.org/packages/com.nextcloud.client/``
  */
 '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',
 'customclient_fdroid' =>
-	'https://f-droid.org/packages/com.nextcloud.client/',
+    'https://f-droid.org/packages/com.nextcloud.client/',
 /**
- * Apps
- *
- * Options for the Apps folder, Apps store, and App code checker.
- */
+     * Apps
+     *
+     * Options for the Apps folder, Apps store, and App code checker.
+     */
 
 /**
  * Set the default app to open on login. The entry IDs can be retrieved from
@@ -1247,11 +1247,11 @@ 
  * indicates if a Web server can write files to that folder.
  */
 'apps_paths' => [
-	[
-		'path'=> '/var/www/nextcloud/apps',
-		'url' => '/apps',
-		'writable' => true,
-	],
+    [
+        'path'=> '/var/www/nextcloud/apps',
+        'url' => '/apps',
+        'writable' => true,
+    ],
 ],
 
 /**
@@ -1406,16 +1406,16 @@ 
  *  - ``OC\Preview\XBitmap``
  */
 'enabledPreviewProviders' => [
-	'OC\Preview\BMP',
-	'OC\Preview\GIF',
-	'OC\Preview\JPEG',
-	'OC\Preview\Krita',
-	'OC\Preview\MarkDown',
-	'OC\Preview\MP3',
-	'OC\Preview\OpenDocument',
-	'OC\Preview\PNG',
-	'OC\Preview\TXT',
-	'OC\Preview\XBitmap',
+    'OC\Preview\BMP',
+    'OC\Preview\GIF',
+    'OC\Preview\JPEG',
+    'OC\Preview\Krita',
+    'OC\Preview\MarkDown',
+    'OC\Preview\MP3',
+    'OC\Preview\OpenDocument',
+    'OC\Preview\PNG',
+    'OC\Preview\TXT',
+    'OC\Preview\XBitmap',
 ],
 
 /**
@@ -1531,11 +1531,11 @@ 
 
 /**
  * Extra SSL options to be used for configuration.
-  *
+ *
  * Defaults to an empty array.
  */
 'openssl' => [
-	'config' => '/absolute/location/of/openssl.cnf',
+    'config' => '/absolute/location/of/openssl.cnf',
 ],
 
 /**
@@ -1586,20 +1586,20 @@ 
  * See https://redis.io/topics/encryption for more information.
  */
 'redis' => [
-	'host' => 'localhost', // can also be a unix domain socket: '/tmp/redis.sock'
-	'port' => 6379,
-	'timeout' => 0.0,
-	'read_timeout' => 0.0,
-	'user' =>  '', // Optional: if not defined, no password will be used.
-	'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.
-	// If redis in-transit encryption is enabled, provide certificates
-	// SSL context https://www.php.net/manual/en/context.ssl.php
-	'ssl_context' => [
-		'local_cert' => '/certs/redis.crt',
-		'local_pk' => '/certs/redis.key',
-		'cafile' => '/certs/ca.crt'
-	]
+    'host' => 'localhost', // can also be a unix domain socket: '/tmp/redis.sock'
+    'port' => 6379,
+    'timeout' => 0.0,
+    'read_timeout' => 0.0,
+    'user' =>  '', // Optional: if not defined, no password will be used.
+    '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.
+    // If redis in-transit encryption is enabled, provide certificates
+    // SSL context https://www.php.net/manual/en/context.ssl.php
+    'ssl_context' => [
+        'local_cert' => '/certs/redis.crt',
+        'local_pk' => '/certs/redis.key',
+        'cafile' => '/certs/ca.crt'
+    ]
 ],
 
 /**
@@ -1625,22 +1625,22 @@ 
  * https://github.com/phpredis/phpredis/commit/c5994f2a42b8a348af92d3acb4edff1328ad8ce1
  */
 'redis.cluster' => [
-	'seeds' => [ // provide some or 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,
-	'user' =>  '', // Optional: if not defined, no password will be used.
-	'password' => '', // Optional: if not defined, no password will be used.
-	// If redis in-transit encryption is enabled, provide certificates
-	// SSL context https://www.php.net/manual/en/context.ssl.php
-	'ssl_context' => [
-		'local_cert' => '/certs/redis.crt',
-		'local_pk' => '/certs/redis.key',
-		'cafile' => '/certs/ca.crt'
-	]
+    'seeds' => [ // provide some or 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,
+    'user' =>  '', // Optional: if not defined, no password will be used.
+    'password' => '', // Optional: if not defined, no password will be used.
+    // If redis in-transit encryption is enabled, provide certificates
+    // SSL context https://www.php.net/manual/en/context.ssl.php
+    'ssl_context' => [
+        'local_cert' => '/certs/redis.crt',
+        'local_pk' => '/certs/redis.key',
+        'cafile' => '/certs/ca.crt'
+    ]
 ],
 
 
@@ -1648,36 +1648,36 @@ 
  * Server details for one or more memcached servers to use for memory caching.
  */
 'memcached_servers' => [
-	// hostname, port and optional weight
-	// or path and port 0 for unix socket. Also see:
-	// https://www.php.net/manual/en/memcached.addservers.php
-	// https://www.php.net/manual/en/memcached.addserver.php
-	['localhost', 11211],
-	//array('other.host.local', 11211),
+    // hostname, port and optional weight
+    // or path and port 0 for unix socket. Also see:
+    // https://www.php.net/manual/en/memcached.addservers.php
+    // https://www.php.net/manual/en/memcached.addserver.php
+    ['localhost', 11211],
+    //array('other.host.local', 11211),
 ],
 
 /**
  * Connection options for memcached
  */
 'memcached_options' => [
-	// 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,
 ],
 
 
@@ -1722,63 +1722,63 @@ 
  *
  */
 'objectstore' => [
-	'class' => 'OC\\Files\\ObjectStore\\Swift',
-	'arguments' => [
-		// trystack will use your facebook id as the username
-		'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',
-		// uploadPartSize: size of the uploaded chunks, defaults to 524288000
-		'uploadPartSize' => 524288000,
-		// 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 username
+        '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',
+        // uploadPartSize: size of the uploaded chunks, defaults to 524288000
+        'uploadPartSize' => 524288000,
+        // 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',
+    ],
 ],
 
 /**
@@ -1891,9 +1891,9 @@ 
  * Federated Cloud Sharing
  */
 
- /**
-  * Allow self-signed certificates for federated shares
-  */
+    /**
+     * Allow self-signed certificates for federated shares
+     */
 'sharing.federation.allowSelfSignedCertificates' => false,
 
 /**
@@ -1955,11 +1955,11 @@ 
  * does not verify the server cert except --ssl-verify-server-cert is passed manually.
  */
 'dbdriveroptions' => [
-	PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
-	PDO::MYSQL_ATTR_SSL_KEY => '/file/path/to/mysql-client-key.pem',
-	PDO::MYSQL_ATTR_SSL_CERT => '/file/path/to/mysql-client-cert.pem',
-	PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => false,
-	PDO::MYSQL_ATTR_INIT_COMMAND => 'SET wait_timeout = 28800'
+    PDO::MYSQL_ATTR_SSL_CA => '/file/path/to/ca_cert.pem',
+    PDO::MYSQL_ATTR_SSL_KEY => '/file/path/to/mysql-client-key.pem',
+    PDO::MYSQL_ATTR_SSL_CERT => '/file/path/to/mysql-client-cert.pem',
+    PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => false,
+    PDO::MYSQL_ATTR_INIT_COMMAND => 'SET wait_timeout = 28800'
 ],
 
 /**
@@ -2034,10 +2034,10 @@ 
  *  - pgsql (PostgreSQL)
  */
 'supportedDatabases' => [
-	'sqlite',
-	'mysql',
-	'pgsql',
-	'oci',
+    'sqlite',
+    'mysql',
+    'pgsql',
+    'oci',
 ],
 
 /**
@@ -2442,8 +2442,8 @@ 
  * WARNING: only use this if you know what you are doing
  */
 'csrf.optout' => [
-	'/^WebDAVFS/', // OS X Finder
-	'/^Microsoft-WebDAV-MiniRedir/', // Windows webdav drive
+    '/^WebDAVFS/', // OS X Finder
+    '/^Microsoft-WebDAV-MiniRedir/', // Windows webdav drive
 ],
 
 /**
@@ -2595,13 +2595,13 @@ 
  * Defaults to ``['/usr/local/sbin','/usr/local/bin','/usr/sbin','/usr/bin','/sbin','/bin','/opt/bin']``
  */
 'binary_search_paths' => [
-	'/usr/local/sbin',
-	'/usr/local/bin',
-	'/usr/sbin',
-	'/usr/bin',
-	'/sbin',
-	'/bin',
-	'/opt/bin',
+    '/usr/local/sbin',
+    '/usr/local/bin',
+    '/usr/sbin',
+    '/usr/bin',
+    '/sbin',
+    '/bin',
+    '/opt/bin',
 ],
 
 /**

lib/private/Template/JSCombiner.php

Spacing +18 added lines, -18 removed lines

@@ -63,7 +63,7 @@ 
 		$this->appData = $appData;
 		$this->urlGenerator = $urlGenerator;
 		$this->cacheFactory = $cacheFactory;
-		$this->depsCache = $this->cacheFactory->createDistributed('JS-' . md5($this->urlGenerator->getBaseUrl()));
+		$this->depsCache = $this->cacheFactory->createDistributed('JS-'.md5($this->urlGenerator->getBaseUrl()));
 		$this->config = $config;
 		$this->logger = $logger;
 	}
@@ -79,7 +79,7 @@ 
 			return false;
 		}
 
-		$path = explode('/', $root . '/' . $file);
+		$path = explode('/', $root.'/'.$file);
 
 		$fileName = array_pop($path);
 		$path = implode('/', $path);
@@ -109,9 +109,9 @@ 
 			return false;
 		}
 
-		$fileName = $fileName . '.deps';
+		$fileName = $fileName.'.deps';
 		try {
-			$deps = $this->depsCache->get($folder->getName() . '-' . $fileName);
+			$deps = $this->depsCache->get($folder->getName().'-'.$fileName);
 			$fromCache = true;
 			if ($deps === null || $deps === '') {
 				$fromCache = false;
@@ -121,7 +121,7 @@ 
 
 			// check again
 			if ($deps === null || $deps === '') {
-				$this->logger->info('JSCombiner: deps file empty: ' . $fileName);
+				$this->logger->info('JSCombiner: deps file empty: '.$fileName);
 				return false;
 			}
 
@@ -138,7 +138,7 @@ 
 			}
 
 			if ($fromCache === false) {
-				$this->depsCache->set($folder->getName() . '-' . $fileName, json_encode($deps));
+				$this->depsCache->set($folder->getName().'-'.$fileName, json_encode($deps));
 			}
 
 			return true;
@@ -155,17 +155,17 @@ 
 	 */
 	protected function cache($path, $fileName, ISimpleFolder $folder) {
 		$deps = [];
-		$fullPath = $path . '/' . $fileName;
+		$fullPath = $path.'/'.$fileName;
 		$data = json_decode(file_get_contents($fullPath));
 		$deps[$fullPath] = filemtime($fullPath);
 
 		$res = '';
 		foreach ($data as $file) {
-			$filePath = $path . '/' . $file;
+			$filePath = $path.'/'.$file;
 
 			if (is_file($filePath)) {
 				$res .= file_get_contents($filePath);
-				$res .= PHP_EOL . PHP_EOL;
+				$res .= PHP_EOL.PHP_EOL;
 				$deps[$filePath] = filemtime($filePath);
 			}
 		}
@@ -177,7 +177,7 @@ 
 			$cachedfile = $folder->newFile($fileName);
 		}
 
-		$depFileName = $fileName . '.deps';
+		$depFileName = $fileName.'.deps';
 		try {
 			$depFile = $folder->getFile($depFileName);
 		} catch (NotFoundException $e) {
@@ -185,21 +185,21 @@ 
 		}
 
 		try {
-			$gzipFile = $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
+			$gzipFile = $folder->getFile($fileName.'.gzip'); # Safari doesn't like .gz
 		} catch (NotFoundException $e) {
-			$gzipFile = $folder->newFile($fileName . '.gzip'); # Safari doesn't like .gz
+			$gzipFile = $folder->newFile($fileName.'.gzip'); # Safari doesn't like .gz
 		}
 
 		try {
 			$cachedfile->putContent($res);
 			$deps = json_encode($deps);
 			$depFile->putContent($deps);
-			$this->depsCache->set($folder->getName() . '-' . $depFileName, $deps);
+			$this->depsCache->set($folder->getName().'-'.$depFileName, $deps);
 			$gzipFile->putContent(gzencode($res, 9));
-			$this->logger->debug('JSCombiner: successfully cached: ' . $fileName);
+			$this->logger->debug('JSCombiner: successfully cached: '.$fileName);
 			return true;
-		} catch (NotPermittedException|NotFoundException $e) {
-			$this->logger->error('JSCombiner: unable to cache: ' . $fileName);
+		} catch (NotPermittedException | NotFoundException $e) {
+			$this->logger->error('JSCombiner: unable to cache: '.$fileName);
 			return false;
 		}
 	}
@@ -224,7 +224,7 @@ 
 	 */
 	public function getContent($root, $file) {
 		/** @var array $data */
-		$data = json_decode(file_get_contents($root . '/' . $file));
+		$data = json_decode(file_get_contents($root.'/'.$file));
 		if (!is_array($data)) {
 			return [];
 		}
@@ -235,7 +235,7 @@ 
 
 		$result = [];
 		foreach ($data as $f) {
-			$result[] = $path . '/' . $f;
+			$result[] = $path.'/'.$f;
 		}
 
 		return $result;

Indentation +218 added lines, -218 removed lines

@@ -16,222 +16,222 @@
 use Psr\Log\LoggerInterface;
 
 class JSCombiner {
-	/** @var IAppData */
-	protected $appData;
-
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-
-	/** @var ICache */
-	protected $depsCache;
-
-	/** @var SystemConfig */
-	protected $config;
-
-	protected LoggerInterface $logger;
-
-	/** @var ICacheFactory */
-	private $cacheFactory;
-
-	public function __construct(IAppData $appData,
-		IURLGenerator $urlGenerator,
-		ICacheFactory $cacheFactory,
-		SystemConfig $config,
-		LoggerInterface $logger) {
-		$this->appData = $appData;
-		$this->urlGenerator = $urlGenerator;
-		$this->cacheFactory = $cacheFactory;
-		$this->depsCache = $this->cacheFactory->createDistributed('JS-' . md5($this->urlGenerator->getBaseUrl()));
-		$this->config = $config;
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @param string $root
-	 * @param string $file
-	 * @param string $app
-	 * @return bool
-	 */
-	public function process($root, $file, $app) {
-		if ($this->config->getValue('debug') || !$this->config->getValue('installed')) {
-			return false;
-		}
-
-		$path = explode('/', $root . '/' . $file);
-
-		$fileName = array_pop($path);
-		$path = implode('/', $path);
-
-		try {
-			$folder = $this->appData->getFolder($app);
-		} catch (NotFoundException $e) {
-			// creating css appdata folder
-			$folder = $this->appData->newFolder($app);
-		}
-
-		if ($this->isCached($fileName, $folder)) {
-			return true;
-		}
-		return $this->cache($path, $fileName, $folder);
-	}
-
-	/**
-	 * @param string $fileName
-	 * @param ISimpleFolder $folder
-	 * @return bool
-	 */
-	protected function isCached($fileName, ISimpleFolder $folder) {
-		$fileName = str_replace('.json', '.js', $fileName);
-
-		if (!$folder->fileExists($fileName)) {
-			return false;
-		}
-
-		$fileName = $fileName . '.deps';
-		try {
-			$deps = $this->depsCache->get($folder->getName() . '-' . $fileName);
-			$fromCache = true;
-			if ($deps === null || $deps === '') {
-				$fromCache = false;
-				$depFile = $folder->getFile($fileName);
-				$deps = $depFile->getContent();
-			}
-
-			// check again
-			if ($deps === null || $deps === '') {
-				$this->logger->info('JSCombiner: deps file empty: ' . $fileName);
-				return false;
-			}
-
-			$deps = json_decode($deps, true);
-
-			if ($deps === null) {
-				return false;
-			}
-
-			foreach ($deps as $file => $mtime) {
-				if (!file_exists($file) || filemtime($file) > $mtime) {
-					return false;
-				}
-			}
-
-			if ($fromCache === false) {
-				$this->depsCache->set($folder->getName() . '-' . $fileName, json_encode($deps));
-			}
-
-			return true;
-		} catch (NotFoundException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @param string $fileName
-	 * @param ISimpleFolder $folder
-	 * @return bool
-	 */
-	protected function cache($path, $fileName, ISimpleFolder $folder) {
-		$deps = [];
-		$fullPath = $path . '/' . $fileName;
-		$data = json_decode(file_get_contents($fullPath));
-		$deps[$fullPath] = filemtime($fullPath);
-
-		$res = '';
-		foreach ($data as $file) {
-			$filePath = $path . '/' . $file;
-
-			if (is_file($filePath)) {
-				$res .= file_get_contents($filePath);
-				$res .= PHP_EOL . PHP_EOL;
-				$deps[$filePath] = filemtime($filePath);
-			}
-		}
-
-		$fileName = str_replace('.json', '.js', $fileName);
-		try {
-			$cachedfile = $folder->getFile($fileName);
-		} catch (NotFoundException $e) {
-			$cachedfile = $folder->newFile($fileName);
-		}
-
-		$depFileName = $fileName . '.deps';
-		try {
-			$depFile = $folder->getFile($depFileName);
-		} catch (NotFoundException $e) {
-			$depFile = $folder->newFile($depFileName);
-		}
-
-		try {
-			$gzipFile = $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
-		} catch (NotFoundException $e) {
-			$gzipFile = $folder->newFile($fileName . '.gzip'); # Safari doesn't like .gz
-		}
-
-		try {
-			$cachedfile->putContent($res);
-			$deps = json_encode($deps);
-			$depFile->putContent($deps);
-			$this->depsCache->set($folder->getName() . '-' . $depFileName, $deps);
-			$gzipFile->putContent(gzencode($res, 9));
-			$this->logger->debug('JSCombiner: successfully cached: ' . $fileName);
-			return true;
-		} catch (NotPermittedException|NotFoundException $e) {
-			$this->logger->error('JSCombiner: unable to cache: ' . $fileName);
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $appName
-	 * @param string $fileName
-	 * @return string
-	 */
-	public function getCachedJS($appName, $fileName) {
-		$tmpfileLoc = explode('/', $fileName);
-		$fileName = array_pop($tmpfileLoc);
-		$fileName = str_replace('.json', '.js', $fileName);
-
-		return substr($this->urlGenerator->linkToRoute('core.Js.getJs', ['fileName' => $fileName, 'appName' => $appName]), strlen(\OC::$WEBROOT) + 1);
-	}
-
-	/**
-	 * @param string $root
-	 * @param string $file
-	 * @return string[]
-	 */
-	public function getContent($root, $file) {
-		/** @var array $data */
-		$data = json_decode(file_get_contents($root . '/' . $file));
-		if (!is_array($data)) {
-			return [];
-		}
-
-		$path = explode('/', $file);
-		array_pop($path);
-		$path = implode('/', $path);
-
-		$result = [];
-		foreach ($data as $f) {
-			$result[] = $path . '/' . $f;
-		}
-
-		return $result;
-	}
-
-
-	/**
-	 * Clear cache with combined javascript files
-	 *
-	 * @throws NotFoundException
-	 */
-	public function resetCache() {
-		$this->cacheFactory->createDistributed('JS-')->clear();
-		$appDirectory = $this->appData->getDirectoryListing();
-		foreach ($appDirectory as $folder) {
-			foreach ($folder->getDirectoryListing() as $file) {
-				$file->delete();
-			}
-		}
-	}
+    /** @var IAppData */
+    protected $appData;
+
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+
+    /** @var ICache */
+    protected $depsCache;
+
+    /** @var SystemConfig */
+    protected $config;
+
+    protected LoggerInterface $logger;
+
+    /** @var ICacheFactory */
+    private $cacheFactory;
+
+    public function __construct(IAppData $appData,
+        IURLGenerator $urlGenerator,
+        ICacheFactory $cacheFactory,
+        SystemConfig $config,
+        LoggerInterface $logger) {
+        $this->appData = $appData;
+        $this->urlGenerator = $urlGenerator;
+        $this->cacheFactory = $cacheFactory;
+        $this->depsCache = $this->cacheFactory->createDistributed('JS-' . md5($this->urlGenerator->getBaseUrl()));
+        $this->config = $config;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @param string $root
+     * @param string $file
+     * @param string $app
+     * @return bool
+     */
+    public function process($root, $file, $app) {
+        if ($this->config->getValue('debug') || !$this->config->getValue('installed')) {
+            return false;
+        }
+
+        $path = explode('/', $root . '/' . $file);
+
+        $fileName = array_pop($path);
+        $path = implode('/', $path);
+
+        try {
+            $folder = $this->appData->getFolder($app);
+        } catch (NotFoundException $e) {
+            // creating css appdata folder
+            $folder = $this->appData->newFolder($app);
+        }
+
+        if ($this->isCached($fileName, $folder)) {
+            return true;
+        }
+        return $this->cache($path, $fileName, $folder);
+    }
+
+    /**
+     * @param string $fileName
+     * @param ISimpleFolder $folder
+     * @return bool
+     */
+    protected function isCached($fileName, ISimpleFolder $folder) {
+        $fileName = str_replace('.json', '.js', $fileName);
+
+        if (!$folder->fileExists($fileName)) {
+            return false;
+        }
+
+        $fileName = $fileName . '.deps';
+        try {
+            $deps = $this->depsCache->get($folder->getName() . '-' . $fileName);
+            $fromCache = true;
+            if ($deps === null || $deps === '') {
+                $fromCache = false;
+                $depFile = $folder->getFile($fileName);
+                $deps = $depFile->getContent();
+            }
+
+            // check again
+            if ($deps === null || $deps === '') {
+                $this->logger->info('JSCombiner: deps file empty: ' . $fileName);
+                return false;
+            }
+
+            $deps = json_decode($deps, true);
+
+            if ($deps === null) {
+                return false;
+            }
+
+            foreach ($deps as $file => $mtime) {
+                if (!file_exists($file) || filemtime($file) > $mtime) {
+                    return false;
+                }
+            }
+
+            if ($fromCache === false) {
+                $this->depsCache->set($folder->getName() . '-' . $fileName, json_encode($deps));
+            }
+
+            return true;
+        } catch (NotFoundException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @param string $path
+     * @param string $fileName
+     * @param ISimpleFolder $folder
+     * @return bool
+     */
+    protected function cache($path, $fileName, ISimpleFolder $folder) {
+        $deps = [];
+        $fullPath = $path . '/' . $fileName;
+        $data = json_decode(file_get_contents($fullPath));
+        $deps[$fullPath] = filemtime($fullPath);
+
+        $res = '';
+        foreach ($data as $file) {
+            $filePath = $path . '/' . $file;
+
+            if (is_file($filePath)) {
+                $res .= file_get_contents($filePath);
+                $res .= PHP_EOL . PHP_EOL;
+                $deps[$filePath] = filemtime($filePath);
+            }
+        }
+
+        $fileName = str_replace('.json', '.js', $fileName);
+        try {
+            $cachedfile = $folder->getFile($fileName);
+        } catch (NotFoundException $e) {
+            $cachedfile = $folder->newFile($fileName);
+        }
+
+        $depFileName = $fileName . '.deps';
+        try {
+            $depFile = $folder->getFile($depFileName);
+        } catch (NotFoundException $e) {
+            $depFile = $folder->newFile($depFileName);
+        }
+
+        try {
+            $gzipFile = $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
+        } catch (NotFoundException $e) {
+            $gzipFile = $folder->newFile($fileName . '.gzip'); # Safari doesn't like .gz
+        }
+
+        try {
+            $cachedfile->putContent($res);
+            $deps = json_encode($deps);
+            $depFile->putContent($deps);
+            $this->depsCache->set($folder->getName() . '-' . $depFileName, $deps);
+            $gzipFile->putContent(gzencode($res, 9));
+            $this->logger->debug('JSCombiner: successfully cached: ' . $fileName);
+            return true;
+        } catch (NotPermittedException|NotFoundException $e) {
+            $this->logger->error('JSCombiner: unable to cache: ' . $fileName);
+            return false;
+        }
+    }
+
+    /**
+     * @param string $appName
+     * @param string $fileName
+     * @return string
+     */
+    public function getCachedJS($appName, $fileName) {
+        $tmpfileLoc = explode('/', $fileName);
+        $fileName = array_pop($tmpfileLoc);
+        $fileName = str_replace('.json', '.js', $fileName);
+
+        return substr($this->urlGenerator->linkToRoute('core.Js.getJs', ['fileName' => $fileName, 'appName' => $appName]), strlen(\OC::$WEBROOT) + 1);
+    }
+
+    /**
+     * @param string $root
+     * @param string $file
+     * @return string[]
+     */
+    public function getContent($root, $file) {
+        /** @var array $data */
+        $data = json_decode(file_get_contents($root . '/' . $file));
+        if (!is_array($data)) {
+            return [];
+        }
+
+        $path = explode('/', $file);
+        array_pop($path);
+        $path = implode('/', $path);
+
+        $result = [];
+        foreach ($data as $f) {
+            $result[] = $path . '/' . $f;
+        }
+
+        return $result;
+    }
+
+
+    /**
+     * Clear cache with combined javascript files
+     *
+     * @throws NotFoundException
+     */
+    public function resetCache() {
+        $this->cacheFactory->createDistributed('JS-')->clear();
+        $appDirectory = $this->appData->getDirectoryListing();
+        foreach ($appDirectory as $folder) {
+            foreach ($folder->getDirectoryListing() as $file) {
+                $file->delete();
+            }
+        }
+    }
 }

lib/private/Files/Cache/Wrapper/CacheJail.php

Spacing +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
 		if ($path === '') {
 			return $this->getRoot();
 		} else {
-			return $this->getRoot() . '/' . ltrim($path, '/');
+			return $this->getRoot().'/'.ltrim($path, '/');
 		}
 	}
 
@@ -98,7 +98,7 @@ 
 		$rootLength = strlen($root) + 1;
 		if ($path === $root) {
 			return '';
-		} elseif (substr($path, 0, $rootLength) === $root . '/') {
+		} elseif (substr($path, 0, $rootLength) === $root.'/') {
 			return substr($path, $rootLength);
 		} else {
 			return null;
@@ -317,7 +317,7 @@ 
 					new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_OR,
 						[
 							new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'path', $this->getGetUnjailedRoot()),
-							new SearchComparison(ISearchComparison::COMPARE_LIKE_CASE_SENSITIVE, 'path', SearchComparison::escapeLikeParameter($this->getGetUnjailedRoot()) . '/%'),
+							new SearchComparison(ISearchComparison::COMPARE_LIKE_CASE_SENSITIVE, 'path', SearchComparison::escapeLikeParameter($this->getGetUnjailedRoot()).'/%'),
 						],
 					)
 				]

Indentation +304 added lines, -304 removed lines

@@ -22,308 +22,308 @@
  */
 class CacheJail extends CacheWrapper {
 
-	protected string $unjailedRoot;
-
-	public function __construct(
-		?ICache $cache,
-		protected string $root,
-		?CacheDependencies $dependencies = null,
-	) {
-		parent::__construct($cache, $dependencies);
-
-		$this->unjailedRoot = $root;
-		$parent = $cache;
-		while ($parent instanceof CacheWrapper) {
-			if ($parent instanceof CacheJail) {
-				$this->unjailedRoot = $parent->getSourcePath($this->unjailedRoot);
-			}
-			$parent = $parent->getCache();
-		}
-	}
-
-	/**
-	 * @return string
-	 */
-	protected function getRoot() {
-		return $this->root;
-	}
-
-	/**
-	 * Get the root path with any nested jails resolved
-	 *
-	 * @return string
-	 */
-	public function getGetUnjailedRoot() {
-		return $this->unjailedRoot;
-	}
-
-	/**
-	 * @return string
-	 */
-	protected function getSourcePath(string $path) {
-		if ($path === '') {
-			return $this->getRoot();
-		} else {
-			return $this->getRoot() . '/' . ltrim($path, '/');
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @param null|string $root
-	 * @return null|string the jailed path or null if the path is outside the jail
-	 */
-	protected function getJailedPath(string $path, ?string $root = null) {
-		if ($root === null) {
-			$root = $this->getRoot();
-		}
-		if ($root === '') {
-			return $path;
-		}
-		$rootLength = strlen($root) + 1;
-		if ($path === $root) {
-			return '';
-		} elseif (substr($path, 0, $rootLength) === $root . '/') {
-			return substr($path, $rootLength);
-		} else {
-			return null;
-		}
-	}
-
-	protected function formatCacheEntry($entry) {
-		if (isset($entry['path'])) {
-			$entry['path'] = $this->getJailedPath($entry['path']);
-		}
-		return $entry;
-	}
-
-	/**
-	 * get the stored metadata of a file or folder
-	 *
-	 * @param string|int $file
-	 * @return ICacheEntry|false
-	 */
-	public function get($file) {
-		if (is_string($file) or $file == '') {
-			$file = $this->getSourcePath($file);
-		}
-		return parent::get($file);
-	}
-
-	/**
-	 * insert meta data for a new file or folder
-	 *
-	 * @param string $file
-	 * @param array $data
-	 *
-	 * @return int file id
-	 * @throws \RuntimeException
-	 */
-	public function insert($file, array $data) {
-		return $this->getCache()->insert($this->getSourcePath($file), $data);
-	}
-
-	/**
-	 * update the metadata in the cache
-	 *
-	 * @param int $id
-	 * @param array $data
-	 */
-	public function update($id, array $data) {
-		$this->getCache()->update($id, $data);
-	}
-
-	/**
-	 * get the file id for a file
-	 *
-	 * @param string $file
-	 * @return int
-	 */
-	public function getId($file) {
-		return $this->getCache()->getId($this->getSourcePath($file));
-	}
-
-	/**
-	 * get the id of the parent folder of a file
-	 *
-	 * @param string $file
-	 * @return int
-	 */
-	public function getParentId($file) {
-		return $this->getCache()->getParentId($this->getSourcePath($file));
-	}
-
-	/**
-	 * check if a file is available in the cache
-	 *
-	 * @param string $file
-	 * @return bool
-	 */
-	public function inCache($file) {
-		return $this->getCache()->inCache($this->getSourcePath($file));
-	}
-
-	/**
-	 * remove a file or folder from the cache
-	 *
-	 * @param string $file
-	 */
-	public function remove($file) {
-		$this->getCache()->remove($this->getSourcePath($file));
-	}
-
-	/**
-	 * Move a file or folder in the cache
-	 *
-	 * @param string $source
-	 * @param string $target
-	 */
-	public function move($source, $target) {
-		$this->getCache()->move($this->getSourcePath($source), $this->getSourcePath($target));
-	}
-
-	/**
-	 * Get the storage id and path needed for a move
-	 *
-	 * @param string $path
-	 * @return array [$storageId, $internalPath]
-	 */
-	protected function getMoveInfo($path) {
-		return [$this->getNumericStorageId(), $this->getSourcePath($path)];
-	}
-
-	/**
-	 * remove all entries for files that are stored on the storage from the cache
-	 */
-	public function clear() {
-		$this->getCache()->remove($this->getRoot());
-	}
-
-	/**
-	 * @param string $file
-	 *
-	 * @return int Cache::NOT_FOUND, Cache::PARTIAL, Cache::SHALLOW or Cache::COMPLETE
-	 */
-	public function getStatus($file) {
-		return $this->getCache()->getStatus($this->getSourcePath($file));
-	}
-
-	/**
-	 * update the folder size and the size of all parent folders
-	 *
-	 * @param array|ICacheEntry|null $data (optional) meta data of the folder
-	 */
-	public function correctFolderSize(string $path, $data = null, bool $isBackgroundScan = false): void {
-		$cache = $this->getCache();
-		if ($cache instanceof Cache) {
-			$cache->correctFolderSize($this->getSourcePath($path), $data, $isBackgroundScan);
-		}
-	}
-
-	/**
-	 * get the size of a folder and set it in the cache
-	 *
-	 * @param string $path
-	 * @param array|null|ICacheEntry $entry (optional) meta data of the folder
-	 * @return int|float
-	 */
-	public function calculateFolderSize($path, $entry = null) {
-		$cache = $this->getCache();
-		if ($cache instanceof Cache) {
-			return $cache->calculateFolderSize($this->getSourcePath($path), $entry);
-		} else {
-			return 0;
-		}
-	}
-
-	/**
-	 * get all file ids on the files on the storage
-	 *
-	 * @return int[]
-	 */
-	public function getAll() {
-		// not supported
-		return [];
-	}
-
-	/**
-	 * find a folder in the cache which has not been fully scanned
-	 *
-	 * If multiply incomplete folders are in the cache, the one with the highest id will be returned,
-	 * use the one with the highest id gives the best result with the background scanner, since that is most
-	 * likely the folder where we stopped scanning previously
-	 *
-	 * @return string|false the path of the folder or false when no folder matched
-	 */
-	public function getIncomplete() {
-		// not supported
-		return false;
-	}
-
-	/**
-	 * get the path of a file on this storage by it's id
-	 *
-	 * @param int $id
-	 * @return string|null
-	 */
-	public function getPathById($id) {
-		$path = $this->getCache()->getPathById($id);
-		if ($path === null) {
-			return null;
-		}
-
-		return $this->getJailedPath($path);
-	}
-
-	/**
-	 * Move a file or folder in the cache
-	 *
-	 * Note that this should make sure the entries are removed from the source cache
-	 *
-	 * @param \OCP\Files\Cache\ICache $sourceCache
-	 * @param string $sourcePath
-	 * @param string $targetPath
-	 */
-	public function moveFromCache(\OCP\Files\Cache\ICache $sourceCache, $sourcePath, $targetPath) {
-		if ($sourceCache === $this) {
-			return $this->move($sourcePath, $targetPath);
-		}
-		return $this->getCache()->moveFromCache($sourceCache, $sourcePath, $this->getSourcePath($targetPath));
-	}
-
-	public function getQueryFilterForStorage(): ISearchOperator {
-		return $this->addJailFilterQuery($this->getCache()->getQueryFilterForStorage());
-	}
-
-	protected function addJailFilterQuery(ISearchOperator $filter): ISearchOperator {
-		if ($this->getGetUnjailedRoot() !== '' && $this->getGetUnjailedRoot() !== '/') {
-			return new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_AND,
-				[
-					$filter,
-					new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_OR,
-						[
-							new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'path', $this->getGetUnjailedRoot()),
-							new SearchComparison(ISearchComparison::COMPARE_LIKE_CASE_SENSITIVE, 'path', SearchComparison::escapeLikeParameter($this->getGetUnjailedRoot()) . '/%'),
-						],
-					)
-				]
-			);
-		} else {
-			return $filter;
-		}
-	}
-
-	public function getCacheEntryFromSearchResult(ICacheEntry $rawEntry): ?ICacheEntry {
-		if ($this->getGetUnjailedRoot() === '' || str_starts_with($rawEntry->getPath(), $this->getGetUnjailedRoot())) {
-			$rawEntry = $this->getCache()->getCacheEntryFromSearchResult($rawEntry);
-			if ($rawEntry) {
-				$jailedPath = $this->getJailedPath($rawEntry->getPath());
-				if ($jailedPath !== null) {
-					return $this->formatCacheEntry(clone $rawEntry) ?: null;
-				}
-			}
-		}
-
-		return null;
-	}
+    protected string $unjailedRoot;
+
+    public function __construct(
+        ?ICache $cache,
+        protected string $root,
+        ?CacheDependencies $dependencies = null,
+    ) {
+        parent::__construct($cache, $dependencies);
+
+        $this->unjailedRoot = $root;
+        $parent = $cache;
+        while ($parent instanceof CacheWrapper) {
+            if ($parent instanceof CacheJail) {
+                $this->unjailedRoot = $parent->getSourcePath($this->unjailedRoot);
+            }
+            $parent = $parent->getCache();
+        }
+    }
+
+    /**
+     * @return string
+     */
+    protected function getRoot() {
+        return $this->root;
+    }
+
+    /**
+     * Get the root path with any nested jails resolved
+     *
+     * @return string
+     */
+    public function getGetUnjailedRoot() {
+        return $this->unjailedRoot;
+    }
+
+    /**
+     * @return string
+     */
+    protected function getSourcePath(string $path) {
+        if ($path === '') {
+            return $this->getRoot();
+        } else {
+            return $this->getRoot() . '/' . ltrim($path, '/');
+        }
+    }
+
+    /**
+     * @param string $path
+     * @param null|string $root
+     * @return null|string the jailed path or null if the path is outside the jail
+     */
+    protected function getJailedPath(string $path, ?string $root = null) {
+        if ($root === null) {
+            $root = $this->getRoot();
+        }
+        if ($root === '') {
+            return $path;
+        }
+        $rootLength = strlen($root) + 1;
+        if ($path === $root) {
+            return '';
+        } elseif (substr($path, 0, $rootLength) === $root . '/') {
+            return substr($path, $rootLength);
+        } else {
+            return null;
+        }
+    }
+
+    protected function formatCacheEntry($entry) {
+        if (isset($entry['path'])) {
+            $entry['path'] = $this->getJailedPath($entry['path']);
+        }
+        return $entry;
+    }
+
+    /**
+     * get the stored metadata of a file or folder
+     *
+     * @param string|int $file
+     * @return ICacheEntry|false
+     */
+    public function get($file) {
+        if (is_string($file) or $file == '') {
+            $file = $this->getSourcePath($file);
+        }
+        return parent::get($file);
+    }
+
+    /**
+     * insert meta data for a new file or folder
+     *
+     * @param string $file
+     * @param array $data
+     *
+     * @return int file id
+     * @throws \RuntimeException
+     */
+    public function insert($file, array $data) {
+        return $this->getCache()->insert($this->getSourcePath($file), $data);
+    }
+
+    /**
+     * update the metadata in the cache
+     *
+     * @param int $id
+     * @param array $data
+     */
+    public function update($id, array $data) {
+        $this->getCache()->update($id, $data);
+    }
+
+    /**
+     * get the file id for a file
+     *
+     * @param string $file
+     * @return int
+     */
+    public function getId($file) {
+        return $this->getCache()->getId($this->getSourcePath($file));
+    }
+
+    /**
+     * get the id of the parent folder of a file
+     *
+     * @param string $file
+     * @return int
+     */
+    public function getParentId($file) {
+        return $this->getCache()->getParentId($this->getSourcePath($file));
+    }
+
+    /**
+     * check if a file is available in the cache
+     *
+     * @param string $file
+     * @return bool
+     */
+    public function inCache($file) {
+        return $this->getCache()->inCache($this->getSourcePath($file));
+    }
+
+    /**
+     * remove a file or folder from the cache
+     *
+     * @param string $file
+     */
+    public function remove($file) {
+        $this->getCache()->remove($this->getSourcePath($file));
+    }
+
+    /**
+     * Move a file or folder in the cache
+     *
+     * @param string $source
+     * @param string $target
+     */
+    public function move($source, $target) {
+        $this->getCache()->move($this->getSourcePath($source), $this->getSourcePath($target));
+    }
+
+    /**
+     * Get the storage id and path needed for a move
+     *
+     * @param string $path
+     * @return array [$storageId, $internalPath]
+     */
+    protected function getMoveInfo($path) {
+        return [$this->getNumericStorageId(), $this->getSourcePath($path)];
+    }
+
+    /**
+     * remove all entries for files that are stored on the storage from the cache
+     */
+    public function clear() {
+        $this->getCache()->remove($this->getRoot());
+    }
+
+    /**
+     * @param string $file
+     *
+     * @return int Cache::NOT_FOUND, Cache::PARTIAL, Cache::SHALLOW or Cache::COMPLETE
+     */
+    public function getStatus($file) {
+        return $this->getCache()->getStatus($this->getSourcePath($file));
+    }
+
+    /**
+     * update the folder size and the size of all parent folders
+     *
+     * @param array|ICacheEntry|null $data (optional) meta data of the folder
+     */
+    public function correctFolderSize(string $path, $data = null, bool $isBackgroundScan = false): void {
+        $cache = $this->getCache();
+        if ($cache instanceof Cache) {
+            $cache->correctFolderSize($this->getSourcePath($path), $data, $isBackgroundScan);
+        }
+    }
+
+    /**
+     * get the size of a folder and set it in the cache
+     *
+     * @param string $path
+     * @param array|null|ICacheEntry $entry (optional) meta data of the folder
+     * @return int|float
+     */
+    public function calculateFolderSize($path, $entry = null) {
+        $cache = $this->getCache();
+        if ($cache instanceof Cache) {
+            return $cache->calculateFolderSize($this->getSourcePath($path), $entry);
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * get all file ids on the files on the storage
+     *
+     * @return int[]
+     */
+    public function getAll() {
+        // not supported
+        return [];
+    }
+
+    /**
+     * find a folder in the cache which has not been fully scanned
+     *
+     * If multiply incomplete folders are in the cache, the one with the highest id will be returned,
+     * use the one with the highest id gives the best result with the background scanner, since that is most
+     * likely the folder where we stopped scanning previously
+     *
+     * @return string|false the path of the folder or false when no folder matched
+     */
+    public function getIncomplete() {
+        // not supported
+        return false;
+    }
+
+    /**
+     * get the path of a file on this storage by it's id
+     *
+     * @param int $id
+     * @return string|null
+     */
+    public function getPathById($id) {
+        $path = $this->getCache()->getPathById($id);
+        if ($path === null) {
+            return null;
+        }
+
+        return $this->getJailedPath($path);
+    }
+
+    /**
+     * Move a file or folder in the cache
+     *
+     * Note that this should make sure the entries are removed from the source cache
+     *
+     * @param \OCP\Files\Cache\ICache $sourceCache
+     * @param string $sourcePath
+     * @param string $targetPath
+     */
+    public function moveFromCache(\OCP\Files\Cache\ICache $sourceCache, $sourcePath, $targetPath) {
+        if ($sourceCache === $this) {
+            return $this->move($sourcePath, $targetPath);
+        }
+        return $this->getCache()->moveFromCache($sourceCache, $sourcePath, $this->getSourcePath($targetPath));
+    }
+
+    public function getQueryFilterForStorage(): ISearchOperator {
+        return $this->addJailFilterQuery($this->getCache()->getQueryFilterForStorage());
+    }
+
+    protected function addJailFilterQuery(ISearchOperator $filter): ISearchOperator {
+        if ($this->getGetUnjailedRoot() !== '' && $this->getGetUnjailedRoot() !== '/') {
+            return new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_AND,
+                [
+                    $filter,
+                    new SearchBinaryOperator(ISearchBinaryOperator::OPERATOR_OR,
+                        [
+                            new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'path', $this->getGetUnjailedRoot()),
+                            new SearchComparison(ISearchComparison::COMPARE_LIKE_CASE_SENSITIVE, 'path', SearchComparison::escapeLikeParameter($this->getGetUnjailedRoot()) . '/%'),
+                        ],
+                    )
+                ]
+            );
+        } else {
+            return $filter;
+        }
+    }
+
+    public function getCacheEntryFromSearchResult(ICacheEntry $rawEntry): ?ICacheEntry {
+        if ($this->getGetUnjailedRoot() === '' || str_starts_with($rawEntry->getPath(), $this->getGetUnjailedRoot())) {
+            $rawEntry = $this->getCache()->getCacheEntryFromSearchResult($rawEntry);
+            if ($rawEntry) {
+                $jailedPath = $this->getJailedPath($rawEntry->getPath());
+                if ($jailedPath !== null) {
+                    return $this->formatCacheEntry(clone $rawEntry) ?: null;
+                }
+            }
+        }
+
+        return null;
+    }
 }

lib/public/Log/IWriter.php

Indentation +8 added lines, -8 removed lines

@@ -28,12 +28,12 @@
  * @since 14.0.0
  */
 interface IWriter {
-	/**
-	 * @since 14.0.0
-	 *
-	 * @param string $app
-	 * @param string|array $message
-	 * @param int $level
-	 */
-	public function write(string $app, $message, int $level);
+    /**
+     * @since 14.0.0
+     *
+     * @param string $app
+     * @param string|array $message
+     * @param int $level
+     */
+    public function write(string $app, $message, int $level);
 }

apps/dav/templates/schedule-response-options.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 			</div>
 		</fieldset>
 		<fieldset>
-			<input type="submit" value="<?php p($l->t('Save'));?>">
+			<input type="submit" value="<?php p($l->t('Save')); ?>">
 		</fieldset>
 	</form>
 </div>

lib/private/Log/ExceptionSerializer.php

Spacing +8 added lines, -8 removed lines

@@ -188,7 +188,7 @@ 
 
 	private function filterTrace(array $trace) {
 		$sensitiveValues = [];
-		$trace = array_map(function (array $traceLine) use (&$sensitiveValues) {
+		$trace = array_map(function(array $traceLine) use (&$sensitiveValues) {
 			$className = $traceLine['class'] ?? '';
 			if ($className && isset($this->methodsWithSensitiveParametersByClass[$className])
 				&& in_array($traceLine['function'], $this->methodsWithSensitiveParametersByClass[$className], true)) {
@@ -201,7 +201,7 @@ 
 			}
 			return $traceLine;
 		}, $trace);
-		return array_map(function (array $traceLine) use ($sensitiveValues) {
+		return array_map(function(array $traceLine) use ($sensitiveValues) {
 			if (isset($traceLine['args'])) {
 				$traceLine['args'] = $this->removeValuesFromArgs($traceLine['args'], $sensitiveValues);
 			}
@@ -223,7 +223,7 @@ 
 	}
 
 	private function encodeTrace($trace) {
-		$trace = array_map(function (array $line) {
+		$trace = array_map(function(array $line) {
 			if (isset($line['args'])) {
 				$line['args'] = array_map([$this, 'encodeArg'], $line['args']);
 			}
@@ -241,9 +241,9 @@ 
 				];
 			}
 
-			$objectInfo = [ '__class__' => get_class($arg) ];
+			$objectInfo = ['__class__' => get_class($arg)];
 			$objectVars = get_object_vars($arg);
-			return array_map(function ($arg) use ($nestingLevel) {
+			return array_map(function($arg) use ($nestingLevel) {
 				return $this->encodeArg($arg, $nestingLevel - 1);
 			}, array_merge($objectInfo, $objectVars));
 		}
@@ -254,14 +254,14 @@ 
 			}
 
 			// Only log the first 5 elements of an array unless we are on debug
-			if ((int)$this->systemConfig->getValue('loglevel', 2) !== 0) {
+			if ((int) $this->systemConfig->getValue('loglevel', 2) !== 0) {
 				$elemCount = count($arg);
 				if ($elemCount > 5) {
 					$arg = array_slice($arg, 0, 5);
-					$arg[] = 'And ' . ($elemCount - 5) . ' more entries, set log level to debug to see all entries';
+					$arg[] = 'And '.($elemCount - 5).' more entries, set log level to debug to see all entries';
 				}
 			}
-			return array_map(function ($e) use ($nestingLevel) {
+			return array_map(function($e) use ($nestingLevel) {
 				return $this->encodeArg($e, $nestingLevel - 1);
 			}, $arg);
 		}

Indentation +254 added lines, -254 removed lines

@@ -21,287 +21,287 @@
 use OCP\HintException;
 
 class ExceptionSerializer {
-	public const SENSITIVE_VALUE_PLACEHOLDER = '*** sensitive parameters replaced ***';
+    public const SENSITIVE_VALUE_PLACEHOLDER = '*** sensitive parameters replaced ***';
 
-	public const methodsWithSensitiveParameters = [
-		// Session/User
-		'completeLogin',
-		'login',
-		'checkPassword',
-		'checkPasswordNoLogging',
-		'loginWithPassword',
-		'updatePrivateKeyPassword',
-		'validateUserPass',
-		'loginWithToken',
-		'{closure}',
-		'{closure:*',
-		'createSessionToken',
+    public const methodsWithSensitiveParameters = [
+        // Session/User
+        'completeLogin',
+        'login',
+        'checkPassword',
+        'checkPasswordNoLogging',
+        'loginWithPassword',
+        'updatePrivateKeyPassword',
+        'validateUserPass',
+        'loginWithToken',
+        '{closure}',
+        '{closure:*',
+        'createSessionToken',
 
-		// Provisioning
-		'addUser',
+        // Provisioning
+        'addUser',
 
-		// TokenProvider
-		'getToken',
-		'isTokenPassword',
-		'getPassword',
-		'decryptPassword',
-		'logClientIn',
-		'generateToken',
-		'validateToken',
+        // TokenProvider
+        'getToken',
+        'isTokenPassword',
+        'getPassword',
+        'decryptPassword',
+        'logClientIn',
+        'generateToken',
+        'validateToken',
 
-		// TwoFactorAuth
-		'solveChallenge',
-		'verifyChallenge',
+        // TwoFactorAuth
+        'solveChallenge',
+        'verifyChallenge',
 
-		// ICrypto
-		'calculateHMAC',
-		'encrypt',
-		'decrypt',
+        // ICrypto
+        'calculateHMAC',
+        'encrypt',
+        'decrypt',
 
-		// LoginController
-		'tryLogin',
-		'confirmPassword',
+        // LoginController
+        'tryLogin',
+        'confirmPassword',
 
-		// LDAP
-		'bind',
-		'areCredentialsValid',
-		'invokeLDAPMethod',
+        // LDAP
+        'bind',
+        'areCredentialsValid',
+        'invokeLDAPMethod',
 
-		// Encryption
-		'storeKeyPair',
-		'setupUser',
-		'checkSignature',
+        // Encryption
+        'storeKeyPair',
+        'setupUser',
+        'checkSignature',
 
-		// files_external: OCA\Files_External\MountConfig
-		'getBackendStatus',
+        // files_external: OCA\Files_External\MountConfig
+        'getBackendStatus',
 
-		// files_external: UserStoragesController
-		'update',
+        // files_external: UserStoragesController
+        'update',
 
-		// Preview providers, don't log big data strings
-		'imagecreatefromstring',
+        // Preview providers, don't log big data strings
+        'imagecreatefromstring',
 
-		// text: PublicSessionController, SessionController and ApiService
-		'create',
-		'close',
-		'push',
-		'sync',
-		'updateSession',
-		'mention',
-		'loginSessionUser',
+        // text: PublicSessionController, SessionController and ApiService
+        'create',
+        'close',
+        'push',
+        'sync',
+        'updateSession',
+        'mention',
+        'loginSessionUser',
 
-	];
+    ];
 
-	public function __construct(
-		private SystemConfig $systemConfig,
-	) {
-	}
+    public function __construct(
+        private SystemConfig $systemConfig,
+    ) {
+    }
 
-	protected array $methodsWithSensitiveParametersByClass = [
-		SetupController::class => [
-			'run',
-			'display',
-			'loadAutoConfig',
-		],
-		Setup::class => [
-			'install'
-		],
-		Key::class => [
-			'__construct'
-		],
-		Client::class => [
-			'request',
-			'delete',
-			'deleteAsync',
-			'get',
-			'getAsync',
-			'head',
-			'headAsync',
-			'options',
-			'optionsAsync',
-			'patch',
-			'post',
-			'postAsync',
-			'put',
-			'putAsync',
-		],
-		\Redis::class => [
-			'auth'
-		],
-		\RedisCluster::class => [
-			'__construct'
-		],
-		Crypt::class => [
-			'symmetricEncryptFileContent',
-			'encrypt',
-			'generatePasswordHash',
-			'encryptPrivateKey',
-			'decryptPrivateKey',
-			'isValidPrivateKey',
-			'symmetricDecryptFileContent',
-			'checkSignature',
-			'createSignature',
-			'decrypt',
-			'multiKeyDecrypt',
-			'multiKeyEncrypt',
-		],
-		RecoveryController::class => [
-			'adminRecovery',
-			'changeRecoveryPassword'
-		],
-		SettingsController::class => [
-			'updatePrivateKeyPassword',
-		],
-		Encryption::class => [
-			'encrypt',
-			'decrypt',
-		],
-		KeyManager::class => [
-			'checkRecoveryPassword',
-			'storeKeyPair',
-			'setRecoveryKey',
-			'setPrivateKey',
-			'setFileKey',
-			'setAllFileKeys',
-		],
-		Session::class => [
-			'setPrivateKey',
-			'prepareDecryptAll',
-		],
-		\OCA\Encryption\Users\Setup::class => [
-			'setupUser',
-		],
-		UserEventsListener::class => [
-			'handle',
-			'onUserCreated',
-			'onUserLogin',
-			'onBeforePasswordUpdated',
-			'onPasswordUpdated',
-			'onPasswordReset',
-		],
-		PassphraseService::class => [
-			'setPassphraseForUser',
-		],
-	];
+    protected array $methodsWithSensitiveParametersByClass = [
+        SetupController::class => [
+            'run',
+            'display',
+            'loadAutoConfig',
+        ],
+        Setup::class => [
+            'install'
+        ],
+        Key::class => [
+            '__construct'
+        ],
+        Client::class => [
+            'request',
+            'delete',
+            'deleteAsync',
+            'get',
+            'getAsync',
+            'head',
+            'headAsync',
+            'options',
+            'optionsAsync',
+            'patch',
+            'post',
+            'postAsync',
+            'put',
+            'putAsync',
+        ],
+        \Redis::class => [
+            'auth'
+        ],
+        \RedisCluster::class => [
+            '__construct'
+        ],
+        Crypt::class => [
+            'symmetricEncryptFileContent',
+            'encrypt',
+            'generatePasswordHash',
+            'encryptPrivateKey',
+            'decryptPrivateKey',
+            'isValidPrivateKey',
+            'symmetricDecryptFileContent',
+            'checkSignature',
+            'createSignature',
+            'decrypt',
+            'multiKeyDecrypt',
+            'multiKeyEncrypt',
+        ],
+        RecoveryController::class => [
+            'adminRecovery',
+            'changeRecoveryPassword'
+        ],
+        SettingsController::class => [
+            'updatePrivateKeyPassword',
+        ],
+        Encryption::class => [
+            'encrypt',
+            'decrypt',
+        ],
+        KeyManager::class => [
+            'checkRecoveryPassword',
+            'storeKeyPair',
+            'setRecoveryKey',
+            'setPrivateKey',
+            'setFileKey',
+            'setAllFileKeys',
+        ],
+        Session::class => [
+            'setPrivateKey',
+            'prepareDecryptAll',
+        ],
+        \OCA\Encryption\Users\Setup::class => [
+            'setupUser',
+        ],
+        UserEventsListener::class => [
+            'handle',
+            'onUserCreated',
+            'onUserLogin',
+            'onBeforePasswordUpdated',
+            'onPasswordUpdated',
+            'onPasswordReset',
+        ],
+        PassphraseService::class => [
+            'setPassphraseForUser',
+        ],
+    ];
 
-	private function editTrace(array &$sensitiveValues, array $traceLine): array {
-		if (isset($traceLine['args'])) {
-			$sensitiveValues = array_merge($sensitiveValues, $traceLine['args']);
-		}
-		$traceLine['args'] = [self::SENSITIVE_VALUE_PLACEHOLDER];
-		return $traceLine;
-	}
+    private function editTrace(array &$sensitiveValues, array $traceLine): array {
+        if (isset($traceLine['args'])) {
+            $sensitiveValues = array_merge($sensitiveValues, $traceLine['args']);
+        }
+        $traceLine['args'] = [self::SENSITIVE_VALUE_PLACEHOLDER];
+        return $traceLine;
+    }
 
-	private function filterTrace(array $trace) {
-		$sensitiveValues = [];
-		$trace = array_map(function (array $traceLine) use (&$sensitiveValues) {
-			$className = $traceLine['class'] ?? '';
-			if ($className && isset($this->methodsWithSensitiveParametersByClass[$className])
-				&& in_array($traceLine['function'], $this->methodsWithSensitiveParametersByClass[$className], true)) {
-				return $this->editTrace($sensitiveValues, $traceLine);
-			}
-			foreach (self::methodsWithSensitiveParameters as $sensitiveMethod) {
-				if (str_contains($traceLine['function'], $sensitiveMethod)
-					|| (str_ends_with($sensitiveMethod, '*')
-						&& str_starts_with($traceLine['function'], substr($sensitiveMethod, 0, -1)))) {
-					return $this->editTrace($sensitiveValues, $traceLine);
-				}
-			}
-			return $traceLine;
-		}, $trace);
-		return array_map(function (array $traceLine) use ($sensitiveValues) {
-			if (isset($traceLine['args'])) {
-				$traceLine['args'] = $this->removeValuesFromArgs($traceLine['args'], $sensitiveValues);
-			}
-			return $traceLine;
-		}, $trace);
-	}
+    private function filterTrace(array $trace) {
+        $sensitiveValues = [];
+        $trace = array_map(function (array $traceLine) use (&$sensitiveValues) {
+            $className = $traceLine['class'] ?? '';
+            if ($className && isset($this->methodsWithSensitiveParametersByClass[$className])
+                && in_array($traceLine['function'], $this->methodsWithSensitiveParametersByClass[$className], true)) {
+                return $this->editTrace($sensitiveValues, $traceLine);
+            }
+            foreach (self::methodsWithSensitiveParameters as $sensitiveMethod) {
+                if (str_contains($traceLine['function'], $sensitiveMethod)
+                    || (str_ends_with($sensitiveMethod, '*')
+                        && str_starts_with($traceLine['function'], substr($sensitiveMethod, 0, -1)))) {
+                    return $this->editTrace($sensitiveValues, $traceLine);
+                }
+            }
+            return $traceLine;
+        }, $trace);
+        return array_map(function (array $traceLine) use ($sensitiveValues) {
+            if (isset($traceLine['args'])) {
+                $traceLine['args'] = $this->removeValuesFromArgs($traceLine['args'], $sensitiveValues);
+            }
+            return $traceLine;
+        }, $trace);
+    }
 
-	private function removeValuesFromArgs($args, $values): array {
-		$workArgs = [];
-		foreach ($args as $key => $arg) {
-			if (in_array($arg, $values, true)) {
-				$arg = self::SENSITIVE_VALUE_PLACEHOLDER;
-			} elseif (is_array($arg)) {
-				$arg = $this->removeValuesFromArgs($arg, $values);
-			}
-			$workArgs[$key] = $arg;
-		}
-		return $workArgs;
-	}
+    private function removeValuesFromArgs($args, $values): array {
+        $workArgs = [];
+        foreach ($args as $key => $arg) {
+            if (in_array($arg, $values, true)) {
+                $arg = self::SENSITIVE_VALUE_PLACEHOLDER;
+            } elseif (is_array($arg)) {
+                $arg = $this->removeValuesFromArgs($arg, $values);
+            }
+            $workArgs[$key] = $arg;
+        }
+        return $workArgs;
+    }
 
-	private function encodeTrace($trace) {
-		$trace = array_map(function (array $line) {
-			if (isset($line['args'])) {
-				$line['args'] = array_map([$this, 'encodeArg'], $line['args']);
-			}
-			return $line;
-		}, $trace);
-		return $this->filterTrace($trace);
-	}
+    private function encodeTrace($trace) {
+        $trace = array_map(function (array $line) {
+            if (isset($line['args'])) {
+                $line['args'] = array_map([$this, 'encodeArg'], $line['args']);
+            }
+            return $line;
+        }, $trace);
+        return $this->filterTrace($trace);
+    }
 
-	private function encodeArg($arg, $nestingLevel = 5) {
-		if (is_object($arg)) {
-			if ($nestingLevel === 0) {
-				return [
-					'__class__' => get_class($arg),
-					'__properties__' => 'Encoding skipped as the maximum nesting level was reached',
-				];
-			}
+    private function encodeArg($arg, $nestingLevel = 5) {
+        if (is_object($arg)) {
+            if ($nestingLevel === 0) {
+                return [
+                    '__class__' => get_class($arg),
+                    '__properties__' => 'Encoding skipped as the maximum nesting level was reached',
+                ];
+            }
 
-			$objectInfo = [ '__class__' => get_class($arg) ];
-			$objectVars = get_object_vars($arg);
-			return array_map(function ($arg) use ($nestingLevel) {
-				return $this->encodeArg($arg, $nestingLevel - 1);
-			}, array_merge($objectInfo, $objectVars));
-		}
+            $objectInfo = [ '__class__' => get_class($arg) ];
+            $objectVars = get_object_vars($arg);
+            return array_map(function ($arg) use ($nestingLevel) {
+                return $this->encodeArg($arg, $nestingLevel - 1);
+            }, array_merge($objectInfo, $objectVars));
+        }
 
-		if (is_array($arg)) {
-			if ($nestingLevel === 0) {
-				return ['Encoding skipped as the maximum nesting level was reached'];
-			}
+        if (is_array($arg)) {
+            if ($nestingLevel === 0) {
+                return ['Encoding skipped as the maximum nesting level was reached'];
+            }
 
-			// Only log the first 5 elements of an array unless we are on debug
-			if ((int)$this->systemConfig->getValue('loglevel', 2) !== 0) {
-				$elemCount = count($arg);
-				if ($elemCount > 5) {
-					$arg = array_slice($arg, 0, 5);
-					$arg[] = 'And ' . ($elemCount - 5) . ' more entries, set log level to debug to see all entries';
-				}
-			}
-			return array_map(function ($e) use ($nestingLevel) {
-				return $this->encodeArg($e, $nestingLevel - 1);
-			}, $arg);
-		}
+            // Only log the first 5 elements of an array unless we are on debug
+            if ((int)$this->systemConfig->getValue('loglevel', 2) !== 0) {
+                $elemCount = count($arg);
+                if ($elemCount > 5) {
+                    $arg = array_slice($arg, 0, 5);
+                    $arg[] = 'And ' . ($elemCount - 5) . ' more entries, set log level to debug to see all entries';
+                }
+            }
+            return array_map(function ($e) use ($nestingLevel) {
+                return $this->encodeArg($e, $nestingLevel - 1);
+            }, $arg);
+        }
 
-		return $arg;
-	}
+        return $arg;
+    }
 
-	public function serializeException(\Throwable $exception): array {
-		$data = [
-			'Exception' => get_class($exception),
-			'Message' => $exception->getMessage(),
-			'Code' => $exception->getCode(),
-			'Trace' => $this->encodeTrace($exception->getTrace()),
-			'File' => $exception->getFile(),
-			'Line' => $exception->getLine(),
-		];
+    public function serializeException(\Throwable $exception): array {
+        $data = [
+            'Exception' => get_class($exception),
+            'Message' => $exception->getMessage(),
+            'Code' => $exception->getCode(),
+            'Trace' => $this->encodeTrace($exception->getTrace()),
+            'File' => $exception->getFile(),
+            'Line' => $exception->getLine(),
+        ];
 
-		if ($exception instanceof HintException) {
-			$data['Hint'] = $exception->getHint();
-		}
+        if ($exception instanceof HintException) {
+            $data['Hint'] = $exception->getHint();
+        }
 
-		if ($exception->getPrevious()) {
-			$data['Previous'] = $this->serializeException($exception->getPrevious());
-		}
+        if ($exception->getPrevious()) {
+            $data['Previous'] = $this->serializeException($exception->getPrevious());
+        }
 
-		return $data;
-	}
+        return $data;
+    }
 
-	public function enlistSensitiveMethods(string $class, array $methods): void {
-		if (!isset($this->methodsWithSensitiveParametersByClass[$class])) {
-			$this->methodsWithSensitiveParametersByClass[$class] = [];
-		}
-		$this->methodsWithSensitiveParametersByClass[$class] = array_merge($this->methodsWithSensitiveParametersByClass[$class], $methods);
-	}
+    public function enlistSensitiveMethods(string $class, array $methods): void {
+        if (!isset($this->methodsWithSensitiveParametersByClass[$class])) {
+            $this->methodsWithSensitiveParametersByClass[$class] = [];
+        }
+        $this->methodsWithSensitiveParametersByClass[$class] = array_merge($this->methodsWithSensitiveParametersByClass[$class], $methods);
+    }
 }

apps/files_external/lib/Lib/DefinitionParameter.php

Spacing +1 added lines, -1 removed lines

@@ -167,7 +167,7 @@
 	 * @return bool
 	 */
 	public function isFlagSet(int $flag): bool {
-		return (bool)($this->flags & $flag);
+		return (bool) ($this->flags & $flag);
 	}
 
 	/**

Indentation +203 added lines, -203 removed lines

@@ -10,207 +10,207 @@
  * Parameter for an external storage definition
  */
 class DefinitionParameter implements \JsonSerializable {
-	// placeholder value for password fields, when the client updates a storage configuration
-	// placeholder values are ignored and the field is left unmodified
-	public const UNMODIFIED_PLACEHOLDER = '__unmodified__';
-
-	/** Value constants */
-	public const VALUE_TEXT = 0;
-	public const VALUE_BOOLEAN = 1;
-	public const VALUE_PASSWORD = 2;
-
-	/** Flag constants */
-	public const FLAG_NONE = 0;
-	public const FLAG_OPTIONAL = 1;
-	public const FLAG_USER_PROVIDED = 2;
-	public const FLAG_HIDDEN = 4;
-
-	/** @var string human-readable parameter tooltip */
-	private string $tooltip = '';
-
-	/** @var int value type, see self::VALUE_* constants */
-	private int $type = self::VALUE_TEXT;
-
-	/** @var int flags, see self::FLAG_* constants */
-	private int $flags = self::FLAG_NONE;
-
-	/**
-	 * @param string $name parameter name
-	 * @param string $text parameter description
-	 * @param mixed $defaultValue default value
-	 */
-	public function __construct(
-		private string $name,
-		private string $text,
-		private $defaultValue = null,
-	) {
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName(): string {
-		return $this->name;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getText(): string {
-		return $this->text;
-	}
-
-	/**
-	 * Get value type
-	 *
-	 * @return int
-	 */
-	public function getType(): int {
-		return $this->type;
-	}
-
-	/**
-	 * Set value type
-	 *
-	 * @param int $type
-	 * @return self
-	 */
-	public function setType(int $type) {
-		$this->type = $type;
-		return $this;
-	}
-
-	/**
-	 * @return mixed default value
-	 */
-	public function getDefaultValue() {
-		return $this->defaultValue;
-	}
-
-	/**
-	 * @param mixed $defaultValue default value
-	 * @return self
-	 */
-	public function setDefaultValue($defaultValue) {
-		$this->defaultValue = $defaultValue;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getTypeName(): string {
-		switch ($this->type) {
-			case self::VALUE_BOOLEAN:
-				return 'boolean';
-			case self::VALUE_TEXT:
-				return 'text';
-			case self::VALUE_PASSWORD:
-				return 'password';
-			default:
-				return 'unknown';
-		}
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getFlags(): int {
-		return $this->flags;
-	}
-
-	/**
-	 * @param int $flags
-	 * @return self
-	 */
-	public function setFlags(int $flags) {
-		$this->flags = $flags;
-		return $this;
-	}
-
-	/**
-	 * @param int $flag
-	 * @return self
-	 */
-	public function setFlag(int $flag) {
-		$this->flags |= $flag;
-		return $this;
-	}
-
-	/**
-	 * @param int $flag
-	 * @return bool
-	 */
-	public function isFlagSet(int $flag): bool {
-		return (bool)($this->flags & $flag);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getTooltip(): string {
-		return $this->tooltip;
-	}
-
-	/**
-	 * @param string $tooltip
-	 * @return self
-	 */
-	public function setTooltip(string $tooltip) {
-		$this->tooltip = $tooltip;
-		return $this;
-	}
-
-	/**
-	 * Serialize into JSON for client-side JS
-	 */
-	public function jsonSerialize(): array {
-		$result = [
-			'value' => $this->getText(),
-			'flags' => $this->getFlags(),
-			'type' => $this->getType(),
-			'tooltip' => $this->getTooltip(),
-		];
-		$defaultValue = $this->getDefaultValue();
-		if ($defaultValue) {
-			$result['defaultValue'] = $defaultValue;
-		}
-		return $result;
-	}
-
-	public function isOptional(): bool {
-		return $this->isFlagSet(self::FLAG_OPTIONAL) || $this->isFlagSet(self::FLAG_USER_PROVIDED);
-	}
-
-	/**
-	 * Validate a parameter value against this
-	 * Convert type as necessary
-	 *
-	 * @param mixed $value Value to check
-	 * @return bool success
-	 */
-	public function validateValue(&$value): bool {
-		switch ($this->getType()) {
-			case self::VALUE_BOOLEAN:
-				if (!is_bool($value)) {
-					switch ($value) {
-						case 'true':
-							$value = true;
-							break;
-						case 'false':
-							$value = false;
-							break;
-						default:
-							return false;
-					}
-				}
-				break;
-			default:
-				if (!$value && !$this->isOptional()) {
-					return false;
-				}
-				break;
-		}
-		return true;
-	}
+    // placeholder value for password fields, when the client updates a storage configuration
+    // placeholder values are ignored and the field is left unmodified
+    public const UNMODIFIED_PLACEHOLDER = '__unmodified__';
+
+    /** Value constants */
+    public const VALUE_TEXT = 0;
+    public const VALUE_BOOLEAN = 1;
+    public const VALUE_PASSWORD = 2;
+
+    /** Flag constants */
+    public const FLAG_NONE = 0;
+    public const FLAG_OPTIONAL = 1;
+    public const FLAG_USER_PROVIDED = 2;
+    public const FLAG_HIDDEN = 4;
+
+    /** @var string human-readable parameter tooltip */
+    private string $tooltip = '';
+
+    /** @var int value type, see self::VALUE_* constants */
+    private int $type = self::VALUE_TEXT;
+
+    /** @var int flags, see self::FLAG_* constants */
+    private int $flags = self::FLAG_NONE;
+
+    /**
+     * @param string $name parameter name
+     * @param string $text parameter description
+     * @param mixed $defaultValue default value
+     */
+    public function __construct(
+        private string $name,
+        private string $text,
+        private $defaultValue = null,
+    ) {
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string {
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getText(): string {
+        return $this->text;
+    }
+
+    /**
+     * Get value type
+     *
+     * @return int
+     */
+    public function getType(): int {
+        return $this->type;
+    }
+
+    /**
+     * Set value type
+     *
+     * @param int $type
+     * @return self
+     */
+    public function setType(int $type) {
+        $this->type = $type;
+        return $this;
+    }
+
+    /**
+     * @return mixed default value
+     */
+    public function getDefaultValue() {
+        return $this->defaultValue;
+    }
+
+    /**
+     * @param mixed $defaultValue default value
+     * @return self
+     */
+    public function setDefaultValue($defaultValue) {
+        $this->defaultValue = $defaultValue;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTypeName(): string {
+        switch ($this->type) {
+            case self::VALUE_BOOLEAN:
+                return 'boolean';
+            case self::VALUE_TEXT:
+                return 'text';
+            case self::VALUE_PASSWORD:
+                return 'password';
+            default:
+                return 'unknown';
+        }
+    }
+
+    /**
+     * @return int
+     */
+    public function getFlags(): int {
+        return $this->flags;
+    }
+
+    /**
+     * @param int $flags
+     * @return self
+     */
+    public function setFlags(int $flags) {
+        $this->flags = $flags;
+        return $this;
+    }
+
+    /**
+     * @param int $flag
+     * @return self
+     */
+    public function setFlag(int $flag) {
+        $this->flags |= $flag;
+        return $this;
+    }
+
+    /**
+     * @param int $flag
+     * @return bool
+     */
+    public function isFlagSet(int $flag): bool {
+        return (bool)($this->flags & $flag);
+    }
+
+    /**
+     * @return string
+     */
+    public function getTooltip(): string {
+        return $this->tooltip;
+    }
+
+    /**
+     * @param string $tooltip
+     * @return self
+     */
+    public function setTooltip(string $tooltip) {
+        $this->tooltip = $tooltip;
+        return $this;
+    }
+
+    /**
+     * Serialize into JSON for client-side JS
+     */
+    public function jsonSerialize(): array {
+        $result = [
+            'value' => $this->getText(),
+            'flags' => $this->getFlags(),
+            'type' => $this->getType(),
+            'tooltip' => $this->getTooltip(),
+        ];
+        $defaultValue = $this->getDefaultValue();
+        if ($defaultValue) {
+            $result['defaultValue'] = $defaultValue;
+        }
+        return $result;
+    }
+
+    public function isOptional(): bool {
+        return $this->isFlagSet(self::FLAG_OPTIONAL) || $this->isFlagSet(self::FLAG_USER_PROVIDED);
+    }
+
+    /**
+     * Validate a parameter value against this
+     * Convert type as necessary
+     *
+     * @param mixed $value Value to check
+     * @return bool success
+     */
+    public function validateValue(&$value): bool {
+        switch ($this->getType()) {
+            case self::VALUE_BOOLEAN:
+                if (!is_bool($value)) {
+                    switch ($value) {
+                        case 'true':
+                            $value = true;
+                            break;
+                        case 'false':
+                            $value = false;
+                            break;
+                        default:
+                            return false;
+                    }
+                }
+                break;
+            default:
+                if (!$value && !$this->isOptional()) {
+                    return false;
+                }
+                break;
+        }
+        return true;
+    }
 }

apps/files_external/lib/Lib/Backend/DAV.php

Indentation +19 added lines, -19 removed lines

@@ -30,24 +30,24 @@
 use OCP\IL10N;
 
 class DAV extends Backend {
-	use LegacyDependencyCheckPolyfill;
+    use LegacyDependencyCheckPolyfill;
 
-	public function __construct(IL10N $l, Password $legacyAuth) {
-		$this
-			->setIdentifier('dav')
-			->addIdentifierAlias('\OC\Files\Storage\DAV') // legacy compat
-			->setStorageClass('\OC\Files\Storage\DAV')
-			->setText($l->t('WebDAV'))
-			->addParameters([
-				new DefinitionParameter('host', $l->t('URL')),
-				(new DefinitionParameter('root', $l->t('Remote subfolder')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				(new DefinitionParameter('secure', $l->t('Secure https://')))
-					->setType(DefinitionParameter::VALUE_BOOLEAN)
-					->setDefaultValue(true),
-			])
-			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
-			->setLegacyAuthMechanism($legacyAuth)
-		;
-	}
+    public function __construct(IL10N $l, Password $legacyAuth) {
+        $this
+            ->setIdentifier('dav')
+            ->addIdentifierAlias('\OC\Files\Storage\DAV') // legacy compat
+            ->setStorageClass('\OC\Files\Storage\DAV')
+            ->setText($l->t('WebDAV'))
+            ->addParameters([
+                new DefinitionParameter('host', $l->t('URL')),
+                (new DefinitionParameter('root', $l->t('Remote subfolder')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                (new DefinitionParameter('secure', $l->t('Secure https://')))
+                    ->setType(DefinitionParameter::VALUE_BOOLEAN)
+                    ->setDefaultValue(true),
+            ])
+            ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
+            ->setLegacyAuthMechanism($legacyAuth)
+        ;
+    }
 }

apps/files_external/lib/Lib/Backend/OwnCloud.php

Indentation +18 added lines, -18 removed lines

@@ -30,22 +30,22 @@
 use OCP\IL10N;
 
 class OwnCloud extends Backend {
-	public function __construct(IL10N $l, Password $legacyAuth) {
-		$this
-			->setIdentifier('owncloud')
-			->addIdentifierAlias('\OC\Files\Storage\OwnCloud') // legacy compat
-			->setStorageClass('\OCA\Files_External\Lib\Storage\OwnCloud')
-			->setText($l->t('Nextcloud'))
-			->addParameters([
-				new DefinitionParameter('host', $l->t('URL')),
-				(new DefinitionParameter('root', $l->t('Remote subfolder')))
-					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
-				(new DefinitionParameter('secure', $l->t('Secure https://')))
-					->setType(DefinitionParameter::VALUE_BOOLEAN)
-					->setDefaultValue(true),
-			])
-			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
-			->setLegacyAuthMechanism($legacyAuth)
-		;
-	}
+    public function __construct(IL10N $l, Password $legacyAuth) {
+        $this
+            ->setIdentifier('owncloud')
+            ->addIdentifierAlias('\OC\Files\Storage\OwnCloud') // legacy compat
+            ->setStorageClass('\OCA\Files_External\Lib\Storage\OwnCloud')
+            ->setText($l->t('Nextcloud'))
+            ->addParameters([
+                new DefinitionParameter('host', $l->t('URL')),
+                (new DefinitionParameter('root', $l->t('Remote subfolder')))
+                    ->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+                (new DefinitionParameter('secure', $l->t('Secure https://')))
+                    ->setType(DefinitionParameter::VALUE_BOOLEAN)
+                    ->setDefaultValue(true),
+            ])
+            ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
+            ->setLegacyAuthMechanism($legacyAuth)
+        ;
+    }
 }