nextcloud / server

apps/contactsinteraction/composer/composer/autoload_psr4.php

Spacing +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\ContactsInteraction\\' => array($baseDir . '/../lib'),
+    'OCA\\ContactsInteraction\\' => array($baseDir.'/../lib'),
 );

apps/contactsinteraction/composer/composer/ClassLoader.php

Spacing +8 added lines, -8 removed lines

@@ -370,18 +370,18 @@ 
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                        if (file_exists($file = $dir.$pathEnd)) {
                             return $file;
                         }
                     }
@@ -391,7 +391,7 @@ 
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -403,14 +403,14 @@ 
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
         }
 
         if (isset($this->prefixesPsr0[$first])) {
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -420,7 +420,7 @@ 
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                 return $file;
             }
         }

lib/public/Contacts/Events/ContactInteractedWithEvent.php

Indentation +92 added lines, -92 removed lines

@@ -40,97 +40,97 @@
  */
 class ContactInteractedWithEvent extends Event {
 
-	/** @var IUser */
-	private $actor;
-
-	/** @var string|null */
-	private $uid;
-
-	/** @var string|null */
-	private $email;
-
-	/** @var string|null */
-	private $federatedCloudId;
-
-	/**
-	 * @param IUser $actor the user who started the interaction
-	 *
-	 * @since 19.0.0
-	 */
-	public function __construct(IUser $actor) {
-		parent::__construct();
-		$this->actor = $actor;
-	}
-
-	/**
-	 * @return IUser
-	 * @since 19.0.0
-	 */
-	public function getActor(): IUser {
-		return $this->actor;
-	}
-
-	/**
-	 * @return string|null
-	 * @since 19.0.0
-	 */
-	public function getUid(): ?string {
-		return $this->uid;
-	}
-
-	/**
-	 * Set the uid of the person interacted with, if known
-	 *
-	 * @param string $uid
-	 *
-	 * @return self
-	 * @since 19.0.0
-	 */
-	public function setUid(string $uid): self {
-		$this->uid = $uid;
-		return $this;
-	}
-
-	/**
-	 * @return string|null
-	 * @since 19.0.0
-	 */
-	public function getEmail(): ?string {
-		return $this->email;
-	}
-
-	/**
-	 * Set the email of the person interacted with, if known
-	 *
-	 * @param string $email
-	 *
-	 * @return self
-	 * @since 19.0.0
-	 */
-	public function setEmail(string $email): self {
-		$this->email = $email;
-		return $this;
-	}
-
-	/**
-	 * @return string|null
-	 * @since 19.0.0
-	 */
-	public function getFederatedCloudId(): ?string {
-		return $this->federatedCloudId;
-	}
-
-	/**
-	 * Set the federated cloud of the person interacted with, if known
-	 *
-	 * @param string $federatedCloudId
-	 *
-	 * @return self
-	 * @since 19.0.0
-	 */
-	public function setFederatedCloudId(string $federatedCloudId): self {
-		$this->federatedCloudId = $federatedCloudId;
-		return $this;
-	}
+    /** @var IUser */
+    private $actor;
+
+    /** @var string|null */
+    private $uid;
+
+    /** @var string|null */
+    private $email;
+
+    /** @var string|null */
+    private $federatedCloudId;
+
+    /**
+     * @param IUser $actor the user who started the interaction
+     *
+     * @since 19.0.0
+     */
+    public function __construct(IUser $actor) {
+        parent::__construct();
+        $this->actor = $actor;
+    }
+
+    /**
+     * @return IUser
+     * @since 19.0.0
+     */
+    public function getActor(): IUser {
+        return $this->actor;
+    }
+
+    /**
+     * @return string|null
+     * @since 19.0.0
+     */
+    public function getUid(): ?string {
+        return $this->uid;
+    }
+
+    /**
+     * Set the uid of the person interacted with, if known
+     *
+     * @param string $uid
+     *
+     * @return self
+     * @since 19.0.0
+     */
+    public function setUid(string $uid): self {
+        $this->uid = $uid;
+        return $this;
+    }
+
+    /**
+     * @return string|null
+     * @since 19.0.0
+     */
+    public function getEmail(): ?string {
+        return $this->email;
+    }
+
+    /**
+     * Set the email of the person interacted with, if known
+     *
+     * @param string $email
+     *
+     * @return self
+     * @since 19.0.0
+     */
+    public function setEmail(string $email): self {
+        $this->email = $email;
+        return $this;
+    }
+
+    /**
+     * @return string|null
+     * @since 19.0.0
+     */
+    public function getFederatedCloudId(): ?string {
+        return $this->federatedCloudId;
+    }
+
+    /**
+     * Set the federated cloud of the person interacted with, if known
+     *
+     * @param string $federatedCloudId
+     *
+     * @return self
+     * @since 19.0.0
+     */
+    public function setFederatedCloudId(string $federatedCloudId): self {
+        $this->federatedCloudId = $federatedCloudId;
+        return $this;
+    }
 
 }

apps/files/ajax/list.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 $l = \OC::$server->getL10N('files');
 
 // Load the files
-$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : '';
+$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : '';
 $dir = \OC\Files\Filesystem::normalizePath($dir);
 
 try {
@@ -44,11 +44,11 @@ 
 	}
 
 	$data = [];
-	$baseUrl = \OC::$server->getURLGenerator()->linkTo('files', 'index.php') . '?dir=';
+	$baseUrl = \OC::$server->getURLGenerator()->linkTo('files', 'index.php').'?dir=';
 
 	$permissions = $dirInfo->getPermissions();
 
-	$sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name';
+	$sortAttribute = isset($_GET['sort']) ? (string) $_GET['sort'] : 'name';
 	$sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false;
 	$mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : '';
 

Indentation +56 added lines, -56 removed lines

@@ -37,72 +37,72 @@
 $dir = \OC\Files\Filesystem::normalizePath($dir);
 
 try {
-	$dirInfo = \OC\Files\Filesystem::getFileInfo($dir);
-	if (!$dirInfo || $dirInfo->getType() !== 'dir') {
-		http_response_code(404);
-		exit();
-	}
+    $dirInfo = \OC\Files\Filesystem::getFileInfo($dir);
+    if (!$dirInfo || $dirInfo->getType() !== 'dir') {
+        http_response_code(404);
+        exit();
+    }
 
-	$data = [];
-	$baseUrl = \OC::$server->getURLGenerator()->linkTo('files', 'index.php') . '?dir=';
+    $data = [];
+    $baseUrl = \OC::$server->getURLGenerator()->linkTo('files', 'index.php') . '?dir=';
 
-	$permissions = $dirInfo->getPermissions();
+    $permissions = $dirInfo->getPermissions();
 
-	$sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name';
-	$sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false;
-	$mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : '';
+    $sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name';
+    $sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false;
+    $mimetypeFilters = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes']) : '';
 
-	$files = [];
-	// Clean up duplicates from array
-	if (is_array($mimetypeFilters) && count($mimetypeFilters)) {
-		$mimetypeFilters = array_unique($mimetypeFilters);
+    $files = [];
+    // Clean up duplicates from array
+    if (is_array($mimetypeFilters) && count($mimetypeFilters)) {
+        $mimetypeFilters = array_unique($mimetypeFilters);
 
-		if (!in_array('httpd/unix-directory', $mimetypeFilters)) {
-			// append folder filter to be able to browse folders
-			$mimetypeFilters[] = 'httpd/unix-directory';
-		}
+        if (!in_array('httpd/unix-directory', $mimetypeFilters)) {
+            // append folder filter to be able to browse folders
+            $mimetypeFilters[] = 'httpd/unix-directory';
+        }
 
-		// create filelist with mimetype filter - as getFiles only supports on
-		// mimetype filter at once we will filter this folder for each
-		// mimetypeFilter
-		foreach ($mimetypeFilters as $mimetypeFilter) {
-			$files = array_merge($files, \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection, $mimetypeFilter));
-		}
+        // create filelist with mimetype filter - as getFiles only supports on
+        // mimetype filter at once we will filter this folder for each
+        // mimetypeFilter
+        foreach ($mimetypeFilters as $mimetypeFilter) {
+            $files = array_merge($files, \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection, $mimetypeFilter));
+        }
 
-		// sort the files accordingly
-		$files = \OCA\Files\Helper::sortFiles($files, $sortAttribute, $sortDirection);
-	} else {
-		// create file list without mimetype filter
-		$files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection);
-	}
+        // sort the files accordingly
+        $files = \OCA\Files\Helper::sortFiles($files, $sortAttribute, $sortDirection);
+    } else {
+        // create file list without mimetype filter
+        $files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection);
+    }
 
-	$data['directory'] = $dir;
-	$data['files'] = \OCA\Files\Helper::formatFileInfos($files);
-	$data['permissions'] = $permissions;
+    $data['directory'] = $dir;
+    $data['files'] = \OCA\Files\Helper::formatFileInfos($files);
+    $data['permissions'] = $permissions;
 
-	\OC_JSON::success(['data' => $data]);
+    \OC_JSON::success(['data' => $data]);
 } catch (\OCP\Files\StorageNotAvailableException $e) {
-	\OC::$server->getLogger()->logException($e, ['app' => 'files']);
-	\OC_JSON::error([
-		'data' => [
-			'exception' => StorageNotAvailableException::class,
-			'message' => $l->t('Storage is temporarily not available')
-		]
-	]);
+    \OC::$server->getLogger()->logException($e, ['app' => 'files']);
+    \OC_JSON::error([
+        'data' => [
+            'exception' => StorageNotAvailableException::class,
+            'message' => $l->t('Storage is temporarily not available')
+        ]
+    ]);
 } catch (\OCP\Files\StorageInvalidException $e) {
-	\OC::$server->getLogger()->logException($e, ['app' => 'files']);
-	\OC_JSON::error([
-		'data' => [
-			'exception' => StorageInvalidException::class,
-			'message' => $l->t('Storage invalid')
-		]
-	]);
+    \OC::$server->getLogger()->logException($e, ['app' => 'files']);
+    \OC_JSON::error([
+        'data' => [
+            'exception' => StorageInvalidException::class,
+            'message' => $l->t('Storage invalid')
+        ]
+    ]);
 } catch (\Exception $e) {
-	\OC::$server->getLogger()->logException($e, ['app' => 'files']);
-	\OC_JSON::error([
-		'data' => [
-			'exception' => \Exception::class,
-			'message' => $l->t('Unknown error')
-		]
-	]);
+    \OC::$server->getLogger()->logException($e, ['app' => 'files']);
+    \OC_JSON::error([
+        'data' => [
+            'exception' => \Exception::class,
+            'message' => $l->t('Unknown error')
+        ]
+    ]);
 }

apps/files_sharing/public.php

Indentation +10 added lines, -10 removed lines

@@ -28,15 +28,15 @@
 $route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadShare' : 'files_sharing.sharecontroller.showShare';
 
 if ($token !== '') {
-	$protocol = \OC::$server->getRequest()->getHttpProtocol();
-	if ($protocol == 'HTTP/1.0') {
-		http_response_code(302);
-	} else {
-		http_response_code(307);
-	}
-	header('Location: ' . $urlGenerator->linkToRoute($route, ['token' => $token]));
+    $protocol = \OC::$server->getRequest()->getHttpProtocol();
+    if ($protocol == 'HTTP/1.0') {
+        http_response_code(302);
+    } else {
+        http_response_code(307);
+    }
+    header('Location: ' . $urlGenerator->linkToRoute($route, ['token' => $token]));
 } else {
-	http_response_code(404);
-	$tmpl = new OCP\Template('', '404', 'guest');
-	print_unescaped($tmpl->fetchPage());
+    http_response_code(404);
+    $tmpl = new OCP\Template('', '404', 'guest');
+    print_unescaped($tmpl->fetchPage());
 }

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	} else {
 		http_response_code(307);
 	}
-	header('Location: ' . $urlGenerator->linkToRoute($route, ['token' => $token]));
+	header('Location: '.$urlGenerator->linkToRoute($route, ['token' => $token]));
 } else {
 	http_response_code(404);
 	$tmpl = new OCP\Template('', '404', 'guest');

config/config.sample.php

Spacing +4 added lines, -4 removed lines

@@ -234,7 +234,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.
@@ -1184,7 +1184,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',
 	],
@@ -1249,7 +1249,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
@@ -1682,7 +1682,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 +159 added lines, -159 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' => '',
 
 /**
@@ -69,12 +69,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]'
-  ],
+    ],
 
 
 /**
@@ -795,10 +795,10 @@ 
  *  - www.edri.org
  */
 'connectivity_check_domains' => [
-	'www.nextcloud.com',
-	'www.startpage.com',
-	'www.eff.org',
-	'www.edri.org'
+    'www.nextcloud.com',
+    'www.startpage.com',
+    'www.eff.org',
+    'www.edri.org'
 ],
 
 /**
@@ -948,9 +948,9 @@ 
  * Defaults to an empty array.
  */
 'log.condition' => [
-	'shared_secret' => '57b58edb6637fe3059b3595cf9c41b9',
-	'users' => ['sample-user'],
-	'apps' => ['files'],
+    'shared_secret' => '57b58edb6637fe3059b3595cf9c41b9',
+    'users' => ['sample-user'],
+    'apps' => ['files'],
 ],
 
 /**
@@ -1012,18 +1012,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.
@@ -1055,11 +1055,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,
+    ],
 ],
 
 /**
@@ -1135,8 +1135,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 ',
 
 /**
  * Set the URL of the Imaginary service to send image previews to.
@@ -1181,16 +1181,16 @@ 
  *  - OC\Preview\Krita
  */
 'enabledPreviewProviders' => [
-	'OC\Preview\PNG',
-	'OC\Preview\JPEG',
-	'OC\Preview\GIF',
-	'OC\Preview\BMP',
-	'OC\Preview\XBitmap',
-	'OC\Preview\MP3',
-	'OC\Preview\TXT',
-	'OC\Preview\MarkDown',
-	'OC\Preview\OpenDocument',
-	'OC\Preview\Krita',
+    'OC\Preview\PNG',
+    'OC\Preview\JPEG',
+    'OC\Preview\GIF',
+    'OC\Preview\BMP',
+    'OC\Preview\XBitmap',
+    'OC\Preview\MP3',
+    'OC\Preview\TXT',
+    'OC\Preview\MarkDown',
+    'OC\Preview\OpenDocument',
+    'OC\Preview\Krita',
 ],
 
 /**
@@ -1280,11 +1280,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',
 ],
 
 /**
@@ -1335,20 +1335,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'
+    ]
 ],
 
 /**
@@ -1377,22 +1377,22 @@ 
  * 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,
-	'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/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'
+    ]
 ],
 
 
@@ -1400,36 +1400,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,
 ],
 
 
@@ -1475,63 +1475,63 @@ 
  * 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',
-		// 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 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',
+        // 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',
+    ],
 ],
 
 /**
@@ -1648,11 +1648,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'
 ],
 
 /**
@@ -1727,10 +1727,10 @@ 
  *  - pgsql (PostgreSQL)
  */
 'supportedDatabases' => [
-	'sqlite',
-	'mysql',
-	'pgsql',
-	'oci',
+    'sqlite',
+    'mysql',
+    'pgsql',
+    'oci',
 ],
 
 /**
@@ -2112,8 +2112,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
 ],
 
 /**

lib/private/Files/Type/TemplateManager.php

Indentation +33 added lines, -33 removed lines

@@ -29,40 +29,40 @@
  * @deprecated 18.0.0
  */
 class TemplateManager {
-	protected $templates = [];
+    protected $templates = [];
 
-	public function registerTemplate($mimetype, $path) {
-		$this->templates[$mimetype] = $path;
-	}
+    public function registerTemplate($mimetype, $path) {
+        $this->templates[$mimetype] = $path;
+    }
 
-	/**
-	 * get the path of the template for a mimetype
-	 *
-	 * @deprecated 18.0.0
-	 * @param string $mimetype
-	 * @return string|null
-	 */
-	public function getTemplatePath($mimetype) {
-		if (isset($this->templates[$mimetype])) {
-			return $this->templates[$mimetype];
-		} else {
-			return null;
-		}
-	}
+    /**
+     * get the path of the template for a mimetype
+     *
+     * @deprecated 18.0.0
+     * @param string $mimetype
+     * @return string|null
+     */
+    public function getTemplatePath($mimetype) {
+        if (isset($this->templates[$mimetype])) {
+            return $this->templates[$mimetype];
+        } else {
+            return null;
+        }
+    }
 
-	/**
-	 * get the template content for a mimetype
-	 *
-	 * @deprecated 18.0.0
-	 * @param string $mimetype
-	 * @return string
-	 */
-	public function getTemplate($mimetype) {
-		$path = $this->getTemplatePath($mimetype);
-		if ($path) {
-			return file_get_contents($path);
-		} else {
-			return '';
-		}
-	}
+    /**
+     * get the template content for a mimetype
+     *
+     * @deprecated 18.0.0
+     * @param string $mimetype
+     * @return string
+     */
+    public function getTemplate($mimetype) {
+        $path = $this->getTemplatePath($mimetype);
+        if ($path) {
+            return file_get_contents($path);
+        } else {
+            return '';
+        }
+    }
 }

lib/private/Route/CachingRouter.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 	 */
 	public function generate($name, $parameters = [], $absolute = false) {
 		asort($parameters);
-		$key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . sha1(json_encode($parameters)) . (int)$absolute;
+		$key = $this->context->getHost().'#'.$this->context->getBaseUrl().$name.sha1(json_encode($parameters)).(int) $absolute;
 		$cachedKey = $this->cache->get($key);
 		if ($cachedKey) {
 			return $cachedKey;

Indentation +33 added lines, -33 removed lines

@@ -27,39 +27,39 @@
 use Psr\Log\LoggerInterface;
 
 class CachingRouter extends Router {
-	/**
-	 * @var \OCP\ICache
-	 */
-	protected $cache;
+    /**
+     * @var \OCP\ICache
+     */
+    protected $cache;
 
-	/**
-	 * @param \OCP\ICache $cache
-	 */
-	public function __construct($cache, LoggerInterface $logger) {
-		$this->cache = $cache;
-		parent::__construct($logger);
-	}
+    /**
+     * @param \OCP\ICache $cache
+     */
+    public function __construct($cache, LoggerInterface $logger) {
+        $this->cache = $cache;
+        parent::__construct($logger);
+    }
 
-	/**
-	 * Generate url based on $name and $parameters
-	 *
-	 * @param string $name Name of the route to use.
-	 * @param array $parameters Parameters for the route
-	 * @param bool $absolute
-	 * @return string
-	 */
-	public function generate($name, $parameters = [], $absolute = false) {
-		asort($parameters);
-		$key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . sha1(json_encode($parameters)) . (int)$absolute;
-		$cachedKey = $this->cache->get($key);
-		if ($cachedKey) {
-			return $cachedKey;
-		} else {
-			$url = parent::generate($name, $parameters, $absolute);
-			if ($url) {
-				$this->cache->set($key, $url, 3600);
-			}
-			return $url;
-		}
-	}
+    /**
+     * Generate url based on $name and $parameters
+     *
+     * @param string $name Name of the route to use.
+     * @param array $parameters Parameters for the route
+     * @param bool $absolute
+     * @return string
+     */
+    public function generate($name, $parameters = [], $absolute = false) {
+        asort($parameters);
+        $key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . sha1(json_encode($parameters)) . (int)$absolute;
+        $cachedKey = $this->cache->get($key);
+        if ($cachedKey) {
+            return $cachedKey;
+        } else {
+            $url = parent::generate($name, $parameters, $absolute);
+            if ($url) {
+                $this->cache->set($key, $url, 3600);
+            }
+            return $url;
+        }
+    }
 }

apps/files_trashbin/lib/Sabre/AbstractTrash.php

Indentation +48 added lines, -48 removed lines

@@ -31,67 +31,67 @@
 use OCP\Files\FileInfo;
 
 abstract class AbstractTrash implements ITrash {
-	/** @var ITrashItem */
-	protected $data;
+    /** @var ITrashItem */
+    protected $data;
 
-	/** @var ITrashManager */
-	protected $trashManager;
+    /** @var ITrashManager */
+    protected $trashManager;
 
-	public function __construct(ITrashManager $trashManager, ITrashItem $data) {
-		$this->trashManager = $trashManager;
-		$this->data = $data;
-	}
+    public function __construct(ITrashManager $trashManager, ITrashItem $data) {
+        $this->trashManager = $trashManager;
+        $this->data = $data;
+    }
 
-	public function getFilename(): string {
-		return $this->data->getName();
-	}
+    public function getFilename(): string {
+        return $this->data->getName();
+    }
 
-	public function getDeletionTime(): int {
-		return $this->data->getDeletedTime();
-	}
+    public function getDeletionTime(): int {
+        return $this->data->getDeletedTime();
+    }
 
-	public function getFileId(): int {
-		return $this->data->getId();
-	}
+    public function getFileId(): int {
+        return $this->data->getId();
+    }
 
-	public function getFileInfo(): FileInfo {
-		return $this->data;
-	}
+    public function getFileInfo(): FileInfo {
+        return $this->data;
+    }
 
-	public function getSize(): int {
-		return $this->data->getSize();
-	}
+    public function getSize(): int {
+        return $this->data->getSize();
+    }
 
-	public function getLastModified(): int {
-		return $this->data->getMtime();
-	}
+    public function getLastModified(): int {
+        return $this->data->getMtime();
+    }
 
-	public function getContentType(): string {
-		return $this->data->getMimetype();
-	}
+    public function getContentType(): string {
+        return $this->data->getMimetype();
+    }
 
-	public function getETag(): string {
-		return $this->data->getEtag();
-	}
+    public function getETag(): string {
+        return $this->data->getEtag();
+    }
 
-	public function getName(): string {
-		return $this->data->getName();
-	}
+    public function getName(): string {
+        return $this->data->getName();
+    }
 
-	public function getOriginalLocation(): string {
-		return $this->data->getOriginalLocation();
-	}
+    public function getOriginalLocation(): string {
+        return $this->data->getOriginalLocation();
+    }
 
-	public function getTitle(): string {
-		return $this->data->getTitle();
-	}
+    public function getTitle(): string {
+        return $this->data->getTitle();
+    }
 
-	public function delete() {
-		$this->trashManager->removeItem($this->data);
-	}
+    public function delete() {
+        $this->trashManager->removeItem($this->data);
+    }
 
-	public function restore(): bool {
-		$this->trashManager->restoreItem($this->data);
-		return true;
-	}
+    public function restore(): bool {
+        $this->trashManager->restoreItem($this->data);
+        return true;
+    }
 }